Kaynağa Gözat

Merge remote-tracking branch 'origin/master'

DESKTOP-BGJIU14\ck 2 gün önce
ebeveyn
işleme
ed6c30c261
62 değiştirilmiş dosya ile 5358 ekleme ve 946 silme
  1. 0 0
      Assets/Art/UIAssets/TextrueJson/jingjie.txt
  2. 1 1
      Assets/Art/UIAssets/TextrueJson/touxiang.txt
  3. BIN
      Assets/Art/UIAssets/bg/bg_lh_queyinger.png
  4. 3 3
      Assets/Art/UIAssets/bg/bg_lh_queyinger.png.meta
  5. BIN
      Assets/Art/UIAssets/decorate/dec_tp_jj_db.png
  6. 3 3
      Assets/Art/UIAssets/decorate/dec_tp_jj_db.png.meta
  7. BIN
      Assets/Art/UIAssets/decorate/dec_zi_djcg.png
  8. 203 0
      Assets/Art/UIAssets/decorate/dec_zi_djcg.png.meta
  9. BIN
      Assets/Art/UIAssets/decorate/dec_zi_jjym.png
  10. 203 0
      Assets/Art/UIAssets/decorate/dec_zi_jjym.png.meta
  11. BIN
      Assets/Art/UIAssets/icon/icon_tx9005.png
  12. 203 0
      Assets/Art/UIAssets/icon/icon_tx9005.png.meta
  13. 148 0
      Assets/Art/VFX/Materials/UIMat/ui_fzgf_wl1.mat
  14. 8 0
      Assets/Art/VFX/Materials/UIMat/ui_fzgf_wl1.mat.meta
  15. 1 1
      Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat
  16. 662 224
      Assets/Art/cs3.scene
  17. 2 1
      Assets/Res/Config/EventConfig.json
  18. 178 159
      Assets/Res/Config/EventLinkConfig.json
  19. 1408 72
      Assets/Res/Config/ItemConfig.json
  20. 212 212
      Assets/Res/Config/LanguageChineseConfig.json
  21. 173 109
      Assets/Res/UI/HeroInformainPanel/HerYuanManSuccessPanel.prefab
  22. 107 16
      Assets/Res/UI/HeroInformainPanel/HeroAttributeWidget.prefab
  23. 1 1
      Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab
  24. 277 23
      Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab
  25. 1063 0
      Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab
  26. 7 0
      Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab.meta
  27. BIN
      Assets/Res/UI/HeroInformainPanel/修炼-渡劫成功.png
  28. 2 2
      Assets/Res/UI/HeroInformainPanel/修炼-渡劫成功.png.meta
  29. BIN
      Assets/Res/UI/HeroInformainPanel/洞府-修炼.png
  30. BIN
      Assets/Res/UI/HeroInformainPanel/道侣.png
  31. BIN
      Assets/Res/UI/HeroInformainPanel/道侣邀请未选择.png
  32. 1 0
      Assets/Res/UIAtlas/fabao.spriteatlasv2
  33. 3 0
      Assets/Res/UIAtlas/jingjie.spriteatlasv2
  34. 30 0
      Assets/Res/UIAtlas/touxiang.spriteatlasv2
  35. 31 0
      Assets/Res/UIAtlas/touxiang.spriteatlasv2.meta
  36. 31 2
      Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs
  37. 3 2
      Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs
  38. 1 1
      Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase9.cs
  39. 24 24
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HerYuanManSuccessPanel.cs
  40. 0 11
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HerYuanManSuccessPanelData.cs
  41. 74 58
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs
  42. 103 13
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs
  43. 44 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanelData.cs
  44. 52 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanel.cs
  45. 11 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanel.cs.meta
  46. 73 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanelData.cs
  47. 11 0
      Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanelData.cs.meta
  48. 0 7
      Assets/StreamingAssets/assetBundle.zip.meta
  49. 0 0
      Assets/StreamingAssets/assetConfig.txt
  50. BIN
      Excel2Json/Excel/EventConfig.xlsx
  51. BIN
      Excel2Json/Excel/HeroModel.xlsx
  52. BIN
      Excel2Json/Excel/Item.xlsx
  53. BIN
      Excel2Json/Excel/Language.xlsx
  54. BIN
      Excel2Json/Excel/MonsterPowerUp.xlsx
  55. 0 0
      UGUIPack/uguiconfig.db
  56. 0 0
      美术/unity_use_ui/TextrueJson/jingjie.txt
  57. 1 1
      美术/unity_use_ui/TextrueJson/touxiang.txt
  58. BIN
      美术/unity_use_ui/bg/bg_lh_queyinger.png
  59. BIN
      美术/unity_use_ui/decorate/dec_tp_jj_db.png
  60. BIN
      美术/unity_use_ui/decorate/dec_zi_djcg.png
  61. BIN
      美术/unity_use_ui/decorate/dec_zi_jjym.png
  62. BIN
      美术/unity_use_ui/icon/icon_tx9005.png

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/jingjie.txt


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

@@ -1 +1 @@
-{"packName":"touxiang","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx1001","filePath":"/icon/icon_tx1001.png"},{"textrueName":"icon_tx1003","filePath":"/icon/icon_tx1003.png"},{"textrueName":"icon_tx1005","filePath":"/icon/icon_tx1005.png"},{"textrueName":"icon_tx1006","filePath":"/icon/icon_tx1006.png"},{"textrueName":"icon_tx1007","filePath":"/icon/icon_tx1007.png"},{"textrueName":"icon_tx1008","filePath":"/icon/icon_tx1008.png"},{"textrueName":"icon_tx101","filePath":"/icon/icon_tx101.png"},{"textrueName":"icon_tx5006","filePath":"/icon/icon_tx5006.png"},{"textrueName":"icon_tx5007","filePath":"/icon/icon_tx5007.png"},{"textrueName":"icon_tx9001","filePath":"/icon/icon_tx9001.png"},{"textrueName":"icon_tx9002","filePath":"/icon/icon_tx9002.png"},{"textrueName":"icon_tx9003","filePath":"/icon/icon_tx9003.png"},{"textrueName":"icon_tx9004","filePath":"/icon/icon_tx9004.png"},{"textrueName":"icon_tx9006","filePath":"/icon/icon_tx9006.png"}],"keyToValue":{}}
+{"packName":"touxiang","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx1001","filePath":"/icon/icon_tx1001.png"},{"textrueName":"icon_tx1003","filePath":"/icon/icon_tx1003.png"},{"textrueName":"icon_tx1005","filePath":"/icon/icon_tx1005.png"},{"textrueName":"icon_tx1006","filePath":"/icon/icon_tx1006.png"},{"textrueName":"icon_tx1007","filePath":"/icon/icon_tx1007.png"},{"textrueName":"icon_tx1008","filePath":"/icon/icon_tx1008.png"},{"textrueName":"icon_tx101","filePath":"/icon/icon_tx101.png"},{"textrueName":"icon_tx5006","filePath":"/icon/icon_tx5006.png"},{"textrueName":"icon_tx5007","filePath":"/icon/icon_tx5007.png"},{"textrueName":"icon_tx9001","filePath":"/icon/icon_tx9001.png"},{"textrueName":"icon_tx9002","filePath":"/icon/icon_tx9002.png"},{"textrueName":"icon_tx9003","filePath":"/icon/icon_tx9003.png"},{"textrueName":"icon_tx9004","filePath":"/icon/icon_tx9004.png"},{"textrueName":"icon_tx9005","filePath":"/icon/icon_tx9005.png"},{"textrueName":"icon_tx9006","filePath":"/icon/icon_tx9006.png"}],"keyToValue":{}}

BIN
Assets/Art/UIAssets/bg/bg_lh_queyinger.png


+ 3 - 3
Assets/Res/UI/HeroInformainPanel/洞府-修炼.png.meta → Assets/Art/UIAssets/bg/bg_lh_queyinger.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: DShO4yOlVip1EL7ueoSulSR+as0pxx5H/xIt2oOFbuv4J/E2WkYtBPnFi3Ns
+guid: Dygd5yz7AnooweE3oCU9hYVkNSluRH77jkN5gdMlrJBKnVwF0R1Ke23d6+nn
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: "\u6D1E\u5E9C-\u4FEE\u70BC"
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Art/UIAssets/decorate/dec_tp_jj_db.png


+ 3 - 3
Assets/Res/UI/HeroInformainPanel/道侣邀请未选择.png.meta → Assets/Art/UIAssets/decorate/dec_tp_jj_db.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Ci8d5y/4B3xpwPP0yi0NW7eNsyXQoeA0jYz2CoiPfOFigw7jSXCGhkKha/cP
+guid: XH9J5iuvUShgwHsN8eOrmXvN+fBWuJbf/q2unPKZa1P7/lwCjGHiT69v+DiP
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: "\u9053\u4FA3\u9080\u8BF7\u672A\u9009\u62E9"
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Art/UIAssets/decorate/dec_zi_djcg.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: C30bvS2tWi1oC/gTgpmt8mlEdJXFE4Kvz6fGibFWuG0dRIcVN63aYxq6fVxO
+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: 

BIN
Assets/Art/UIAssets/decorate/dec_zi_jjym.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CX0X4y/5AH0J+kJE51jXBL9sK87rta/siGo91p6hOZpijqLpf0zKaC5oOczD
+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: 

BIN
Assets/Art/UIAssets/icon/icon_tx9005.png


+ 203 - 0
Assets/Art/UIAssets/icon/icon_tx9005.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: BitKsCytUyq6Z22WLadf8N8UpKcTHvDKMOxKmaPXhd9k6RMST2kEHksQHCa/
+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: 

+ 148 - 0
Assets/Art/VFX/Materials/UIMat/ui_fzgf_wl1.mat

@@ -0,0 +1,148 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: ui_fzgf_wl1
+  m_Shader: {fileID: 4800000, guid: 7d5403880352cd348b8ca3d1f3a67447, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: ca1f245540fbeaa44925b44b3bf1137e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Main_Tex:
+        m_Texture: {fileID: 2800000, guid: 95e602e250156af468901ae4f4b3fa00, type: 3}
+        m_Scale: {x: 1, y: 4}
+        m_Offset: {x: 0, y: 0}
+    - _Mask:
+        m_Texture: {fileID: 2800000, guid: f77f8f8d7482c1b44b0dad32ff004bec, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Noise94:
+        m_Texture: {fileID: 2800000, guid: bfcfae059f1e1884f97acc795fe3af1b, type: 3}
+        m_Scale: {x: 0.63, y: 0.2}
+        m_Offset: {x: 0, y: 0}
+    - _RJraodong:
+        m_Texture: {fileID: 2800000, guid: 8dd972cbb6cdc024a9da718d46ea3dfc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Rj2Tex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _TextureGao:
+        m_Texture: {fileID: 2800000, guid: 21c0294d6ec1f9c47980c8c890eaf624, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Turb_Noise:
+        m_Texture: {fileID: 2800000, guid: 38a4e7dc480d0ec42ad7228c1b113799, type: 3}
+        m_Scale: {x: 1, y: 2}
+        m_Offset: {x: 0, y: 0}
+    - _dissolve:
+        m_Texture: {fileID: 2800000, guid: 893077602610eaf4e9b93d85a92b7323, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _rj2:
+        m_Texture: {fileID: 2800000, guid: 40ce12562f100a14eb5a661cb9774fbc, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _Alpha: 1
+    - _AlphaCutoff: 0.5
+    - _AlphaQD: 1
+    - _CTime: 1
+    - _ColorMask: 0
+    - _CustomDataDissolve: 0
+    - _CustomDataMainUV: 0
+    - _CustomDataMainUV1: 0
+    - _DissSoft: 0.3
+    - _Diss_value: 0
+    - _Float0: 0.6
+    - _Float2: 0.684
+    - _Float3: 0.323
+    - _Float4: 0
+    - _Float7: 0.21
+    - _Float8: 0.118
+    - _Liangbu: 0.16
+    - _MainAlpha: 0
+    - _MainSpeedU: 0
+    - _MainSpeedV: -0.3
+    - _MainTexOffsetU: 0
+    - _MainTexOffsetV: 0
+    - _MainTilingU: 2
+    - _MainTilingV: 0.3
+    - _MaskSpeedU: 0.5
+    - _MaskSpeedV: 0.5
+    - _MaskTexOffsetU: 0
+    - _MaskTexOffsetV: 0
+    - _MaskTilingU: 1
+    - _MaskTilingV: 1
+    - _MaskTimeSpeedON1: 0
+    - _QueueControl: 0
+    - _QueueOffset: 0
+    - _RJ1soft: 0
+    - _RJ2soft: 0
+    - _RJraodongqd: 0.3
+    - _RJraodongsd: 0.1
+    - _ReceiveShadows: 0
+    - _Soft_value: 0
+    - _Stencil: 0
+    - _StencilComp: 0
+    - _StencilOp: 0
+    - _StencilReadMask: 0
+    - _StencilWriteMask: 0
+    - _TimeSpeedON: 1
+    - _Turb_Value: 0.75
+    - _alpha: 1
+    - _ca: 1
+    - _lerp: 0.5
+    - _light: 1
+    - _power: 5
+    - _soft: 0
+    - _zhongjian: 0.92
+    m_Colors:
+    - _Color: {r: 4, g: 4, b: 4, a: 1}
+    - _Color0: {r: 0.2051282, g: 0.923077, b: 1, a: 1}
+    - _ColorGG: {r: 0.2594338, g: 0.2594338, b: 0.2594338, a: 1}
+    - _Diss_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Main_Color: {r: 2.79544, g: 2.79544, b: 2.79544, a: 1}
+    - _Main_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _MaskUVSpeed: {r: 0, g: 0, b: 0, a: 0}
+    - _Mask_UV: {r: 0, g: 0, b: 0, a: 0}
+    - _Turb_UV: {r: 0, g: 0.5, b: 0, a: 0}
+  m_BuildTextureStacks: []

+ 8 - 0
Assets/Art/VFX/Materials/UIMat/ui_fzgf_wl1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Dn1OsSP4UijtMp8zFhJXmhCe8970xOjLOUZE9fBvao+wa4QbHRzbGYuFSzzD
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.0073602796
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Dosya farkı çok büyük olduğundan ihmal edildi
+ 662 - 224
Assets/Art/cs3.scene


+ 2 - 1
Assets/Res/Config/EventConfig.json

@@ -1829,7 +1829,6 @@
         1001109,
         1001110,
         1001111,
-        1001112,
         102,
         103
       ],
@@ -1862,6 +1861,8 @@
         1001201,
         1001202,
         1001203,
+        1001204,
+        1001205,
         102,
         103
       ],

Dosya farkı çok büyük olduğundan ihmal edildi
+ 178 - 159
Assets/Res/Config/EventLinkConfig.json


+ 1408 - 72
Assets/Res/Config/ItemConfig.json

@@ -377,7 +377,7 @@
       "itemDesc": 259,
       "icon": "icon_dujiedan",
       "itemTag": 3,
-      "quality": 3,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -412,7 +412,7 @@
       "itemDesc": 260,
       "icon": "icon_dujiedan",
       "itemTag": 3,
-      "quality": 4,
+      "quality": 2,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -447,7 +447,7 @@
       "itemDesc": 261,
       "icon": "icon_dujiedan",
       "itemTag": 3,
-      "quality": 5,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -481,7 +481,7 @@
       "itemDesc": 262,
       "icon": "icon_dujiedan",
       "itemTag": 3,
-      "quality": 6,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
@@ -510,16 +510,17 @@
       "itemDesc2": 0
     },
     {
-      "ID": 1301,
-      "itemName": 268,
-      "itemDesc": 272,
-      "icon": "icon_item_1301",
-      "itemTag": 4,
-      "quality": 4,
+      "ID": 1205,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 3,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        5,
+        7
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -537,23 +538,58 @@
       "associateVlaue": [
         1,
         300,
-        45,
+        10,
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1206,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
         0
       ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        25
+      ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1302,
-      "itemName": 269,
-      "itemDesc": 273,
-      "icon": "icon_item_1302",
-      "itemTag": 4,
+      "ID": 1207,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
       "quality": 4,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        5
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -571,23 +607,23 @@
       "associateVlaue": [
         1,
         300,
-        40,
-        0
+        25,
+        50
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1303,
-      "itemName": 270,
-      "itemDesc": 274,
-      "icon": "icon_item_1303",
-      "itemTag": 4,
+      "ID": 1208,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
       "quality": 4,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        5
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -605,23 +641,24 @@
       "associateVlaue": [
         1,
         300,
-        35,
-        0
+        40,
+        80
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1304,
-      "itemName": 271,
-      "itemDesc": 275,
-      "icon": "icon_item_1304",
-      "itemTag": 4,
-      "quality": 5,
+      "ID": 1209,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        5,
+        7
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -639,23 +676,58 @@
       "associateVlaue": [
         1,
         300,
-        30,
+        10,
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1210,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
         0
       ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        25
+      ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1305,
-      "itemName": 10112,
-      "itemDesc": 10117,
-      "icon": "icon_item_1305",
-      "itemTag": 4,
-      "quality": 5,
+      "ID": 1211,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        5
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -674,22 +746,57 @@
         1,
         300,
         25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1212,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
         0
       ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1306,
-      "itemName": 10113,
-      "itemDesc": 10118,
-      "icon": "icon_item_1306",
-      "itemTag": 4,
+      "ID": 1213,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
       "quality": 5,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        5,
+        7
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -707,23 +814,24 @@
       "associateVlaue": [
         1,
         300,
-        20,
-        0
+        10,
+        10
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1307,
-      "itemName": 10114,
-      "itemDesc": 10119,
-      "icon": "icon_item_1307",
-      "itemTag": 4,
-      "quality": 6,
+      "ID": 1214,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        5,
+        7
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -742,22 +850,22 @@
         1,
         300,
         15,
-        0
+        25
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1308,
-      "itemName": 10115,
-      "itemDesc": 10120,
-      "icon": "icon_item_1308",
-      "itemTag": 4,
-      "quality": 6,
+      "ID": 1215,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
       "stack": 0,
       "isSell": false,
       "SkiptoID": [
-        8
+        5
       ],
       "rewardsNum": 0,
       "isVisible": 1,
@@ -775,17 +883,1245 @@
       "associateVlaue": [
         1,
         300,
-        10,
-        0
+        25,
+        50
       ],
       "sort": 0,
       "itemDesc2": 0
     },
     {
-      "ID": 1309,
-      "itemName": 10116,
-      "itemDesc": 10121,
-      "icon": "icon_item_1309",
+      "ID": 1216,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1217,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1218,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        25
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1219,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1220,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1221,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1222,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1223,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        10
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1224,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5,
+        7
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        25
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1225,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        50
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1226,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_dujiedan",
+      "itemTag": 3,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        5
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        80
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1301,
+      "itemName": 268,
+      "itemDesc": 272,
+      "icon": "icon_item_1301",
+      "itemTag": 4,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        45,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1302,
+      "itemName": 269,
+      "itemDesc": 273,
+      "icon": "icon_item_1302",
+      "itemTag": 4,
+      "quality": 2,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1303,
+      "itemName": 270,
+      "itemDesc": 274,
+      "icon": "icon_item_1303",
+      "itemTag": 4,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        35,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1304,
+      "itemName": 271,
+      "itemDesc": 275,
+      "icon": "icon_item_1304",
+      "itemTag": 4,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        30,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1305,
+      "itemName": 10112,
+      "itemDesc": 10117,
+      "icon": "icon_item_1305",
+      "itemTag": 4,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1306,
+      "itemName": 10113,
+      "itemDesc": 10118,
+      "icon": "icon_item_1306",
+      "itemTag": 4,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        20,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1307,
+      "itemName": 10114,
+      "itemDesc": 10119,
+      "icon": "icon_item_1307",
+      "itemTag": 4,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1308,
+      "itemName": 10115,
+      "itemDesc": 10120,
+      "icon": "icon_item_1308",
+      "itemTag": 4,
+      "quality": 3,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1309,
+      "itemName": 10116,
+      "itemDesc": 10121,
+      "icon": "icon_item_1309",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        5,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1310,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1310",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        45,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1311,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1311",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1312,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1312",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        35,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1313,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1313",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        30,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1314,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1314",
+      "itemTag": 4,
+      "quality": 4,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1315,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1315",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        20,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1316,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1316",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1317,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1317",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1318,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1318",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        5,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1319,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1319",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        40,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1320,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1320",
+      "itemTag": 4,
+      "quality": 5,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        35,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1321,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1321",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        30,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1322,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1322",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        25,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1323,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1323",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        20,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1324,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1324",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        15,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1325,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1325",
+      "itemTag": 4,
+      "quality": 6,
+      "stack": 0,
+      "isSell": false,
+      "SkiptoID": [
+        8
+      ],
+      "rewardsNum": 0,
+      "isVisible": 1,
+      "isUse": false,
+      "useLimit": 0,
+      "costItemNum": 0,
+      "rewardsItems": [
+        0
+      ],
+      "rewardsItemNums": [
+        0
+      ],
+      "stack_1": 0,
+      "associateID": 1,
+      "associateVlaue": [
+        1,
+        300,
+        10,
+        0
+      ],
+      "sort": 0,
+      "itemDesc2": 0
+    },
+    {
+      "ID": 1326,
+      "itemName": 0,
+      "itemDesc": 0,
+      "icon": "icon_item_1326",
       "itemTag": 4,
       "quality": 6,
       "stack": 0,

Dosya farkı çok büyük olduğundan ihmal edildi
+ 212 - 212
Assets/Res/Config/LanguageChineseConfig.json


+ 173 - 109
Assets/Res/UI/HeroInformainPanel/HerYuanManSuccessPanel.prefab

@@ -1,5 +1,174 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &59261779062998827
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 456328025436860059}
+  - component: {fileID: 8479161272255151681}
+  - component: {fileID: 387813698951802944}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &456328025436860059
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 59261779062998827}
+  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: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -387}
+  m_SizeDelta: {x: 688.6495, y: 75.9051}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8479161272255151681
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 59261779062998827}
+  m_CullTransparentMesh: 1
+--- !u!114 &387813698951802944
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 59261779062998827}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 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_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 35
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 43
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7075\u6D77\u6F84\u660E,\u9053\u57FA\u7A33\u56FA.\u552F\u6E21\u5929\u52AB\u53EF\u95EE\u66F4\u9AD8\u5927\u9053"
+--- !u!1 &1294179803499213353
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2289476759082914232}
+  - component: {fileID: 5557968576639934990}
+  - component: {fileID: 3083612911296356074}
+  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 &2289476759082914232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1294179803499213353}
+  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: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 335, y: 662}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5557968576639934990
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1294179803499213353}
+  m_CullTransparentMesh: 1
+--- !u!114 &3083612911296356074
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1294179803499213353}
+  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: 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: 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_zi_jjym
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: e9a4a4348976c04ad9208fad61f1d734
+  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 &6015582386914595975
 GameObject:
   m_ObjectHideFlags: 0
@@ -19,7 +188,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &8212670971040085124
 RectTransform:
   m_ObjectHideFlags: 0
@@ -60,7 +229,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.84313726}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -121,107 +290,6 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
---- !u!1 &7371325538380333896
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 543116040436373444}
-  - component: {fileID: 4747113537948573547}
-  - component: {fileID: 4779532759236090049}
-  - component: {fileID: 2381540517331302103}
-  m_Layer: 5
-  m_HasEditorInfo: 1
-  m_Name: 'Text_NextJIngjie '
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!224 &543116040436373444
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7371325538380333896}
-  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: 9037135992368401232}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0.5}
-  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 170.4965, y: 901.433}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4747113537948573547
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7371325538380333896}
-  m_CullTransparentMesh: 1
---- !u!114 &4779532759236090049
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7371325538380333896}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 0.95294124, g: 0.81568635, b: 0.47450984, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 98
-    m_FontStyle: 1
-    m_BestFit: 0
-    m_MinSize: 3
-    m_MaxSize: 100
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u5706\u6EE1\u6210\u529F"
---- !u!114 &2381540517331302103
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7371325538380333896}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_IgnoreLayout: 1
-  m_MinWidth: -1
-  m_MinHeight: -1
-  m_PreferredWidth: -1
-  m_PreferredHeight: -1
-  m_FlexibleWidth: -1
-  m_FlexibleHeight: -1
-  m_LayoutPriority: 1
 --- !u!1 &8994874510214016950
 GameObject:
   m_ObjectHideFlags: 0
@@ -253,7 +321,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8212670971040085124}
-  - {fileID: 543116040436373444}
+  - {fileID: 2289476759082914232}
+  - {fileID: 456328025436860059}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -279,9 +348,4 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
-  - key: 'Text_NextJIngjie '
-    gameObject: {fileID: 4779532759236090049}
-    isAssetBundle: 0
-    isList: 0
-    ListCollectorDatas: []
   isAssetBundle: 0

+ 107 - 16
Assets/Res/UI/HeroInformainPanel/HeroAttributeWidget.prefab

@@ -35,7 +35,7 @@ RectTransform:
   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: 280.79, y: 3.5639}
+  m_AnchoredPosition: {x: 127.7, y: 3.5639}
   m_SizeDelta: {x: 111.28, y: 45.596}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &192917626739261170
@@ -68,7 +68,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 28
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -115,8 +115,8 @@ RectTransform:
   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: 457.4, y: 3.5639}
-  m_SizeDelta: {x: 81.3883, y: 30}
+  m_AnchoredPosition: {x: 419, y: -0.33512}
+  m_SizeDelta: {x: 81.3883, y: 37.798}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6075765814148249060
 CanvasRenderer:
@@ -148,7 +148,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 26
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 2
@@ -193,11 +193,11 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3905833519111515299}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 10.9}
-  m_SizeDelta: {x: 555.4452, y: 1.3502007}
-  m_Pivot: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: -2.063, y: 3.1873}
+  m_SizeDelta: {x: 574.5274, y: 2.1629}
+  m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3660400957717239018
 CanvasRenderer:
   m_ObjectHideFlags: 0
@@ -219,7 +219,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.5764706, g: 0.8470589, b: 0.7843138, a: 1}
+  m_Color: {r: 0.58431375, g: 0.82745105, b: 0.80392164, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -244,6 +244,7 @@ MonoBehaviour:
     packgJsonPath: 
     packgSpritePath: 
     lasetJsonGUID: 
+  imageH: 1.3502007
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -283,7 +284,7 @@ RectTransform:
   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: -2.7000122, y: 1.6}
+  m_AnchoredPosition: {x: -12.9, y: 1.6}
   m_SizeDelta: {x: 81.3883, y: 41.6678}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &4879455564200798581
@@ -316,10 +317,10 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 28
+    m_FontSize: 30
     m_FontStyle: 1
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_Alignment: 3
     m_AlignByGeometry: 0
@@ -361,6 +362,7 @@ RectTransform:
   - {fileID: 5850466370090942673}
   - {fileID: 6949391239389172941}
   - {fileID: 7394528043978614730}
+  - {fileID: 3678271035040921611}
   m_Father: {fileID: 3905833519111515299}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -376,6 +378,95 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4549635221620230061}
   m_CullTransparentMesh: 1
+--- !u!1 &4733503334704012583
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3678271035040921611}
+  - component: {fileID: 6381163825326017891}
+  - component: {fileID: 6595354921559075712}
+  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 &3678271035040921611
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4733503334704012583}
+  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: 8803962581139407905}
+  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: 19, y: 1.6}
+  m_SizeDelta: {x: 28, y: 33}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6381163825326017891
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4733503334704012583}
+  m_CullTransparentMesh: 1
+--- !u!114 &6595354921559075712
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4733503334704012583}
+  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.8431373, g: 0.8470589, b: 0.6392157, 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_juqing_biaoshi1
+  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: e09f56329289dea619e61cb78606497c
+  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 &5575612326490483760
 GameObject:
   m_ObjectHideFlags: 0
@@ -402,7 +493,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5575612326490483760}
-  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_ConstrainProportionsScale: 0
@@ -414,7 +505,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 568.0161, y: 59.1605}
+  m_SizeDelta: {x: 589.25, y: 59.1605}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4935005292868148699
 CanvasRenderer:

+ 1 - 1
Assets/Res/UI/HeroInformainPanel/HeroBreakthroughPanel.prefab

@@ -3387,7 +3387,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 148, y: -22.3432}
-  m_SizeDelta: {x: 210, y: 43.2862}
+  m_SizeDelta: {x: 0, y: 43.2862}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8334097589539832799
 CanvasRenderer:

+ 277 - 23
Assets/Res/UI/HeroInformainPanel/HeroInformationPanel.prefab

@@ -2043,6 +2043,82 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3227758174626508827
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6836626587993943182}
+  - component: {fileID: 1226378177889774439}
+  - component: {fileID: 6867591072674375690}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &6836626587993943182
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3227758174626508827}
+  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: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1226378177889774439
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3227758174626508827}
+  m_CullTransparentMesh: 1
+--- !u!114 &6867591072674375690
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3227758174626508827}
+  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: 675768db88b777e4d9a869134b99ffcd, 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 &3424210249330591111
 GameObject:
   m_ObjectHideFlags: 0
@@ -2242,7 +2318,7 @@ GameObject:
   - component: {fileID: 5132719788074747933}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: myImage
+  m_Name: AttributeBg
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2259,13 +2335,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 2859865283014944201}
+  m_Children:
+  - {fileID: 6341706220095682999}
+  m_Father: {fileID: 9037135992368401232}
   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: 12, y: 323.30005}
-  m_SizeDelta: {x: 604.3209, y: 346}
+  m_AnchoredPosition: {x: 6.0298, y: 316.9}
+  m_SizeDelta: {x: 592.3805, y: 346.9185}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1123871190918833333
 CanvasRenderer:
@@ -2961,8 +3038,6 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6341706220095682999}
-  - {fileID: 5668257681158111763}
   - {fileID: 3106622106931745522}
   - {fileID: 2663430401061570260}
   - {fileID: 5624694180497915839}
@@ -5089,12 +5164,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 2859865283014944201}
+  m_Father: {fileID: 5668257681158111763}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 2.1600037, y: 477}
-  m_SizeDelta: {x: 531.9177, y: 0}
+  m_AnchoredPosition: {x: -5.1293, y: 327.2}
+  m_SizeDelta: {x: 578.0841, y: 0}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5547915736192466516
 CanvasRenderer:
@@ -5122,7 +5197,7 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 10
+  m_Spacing: 5.34
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
   m_ChildControlWidth: 0
@@ -5267,7 +5342,9 @@ RectTransform:
   - {fileID: 5280865914155831809}
   - {fileID: 8212670971040085124}
   - {fileID: 307469801909214118}
+  - {fileID: 6836626587993943182}
   - {fileID: 2859865283014944201}
+  - {fileID: 5668257681158111763}
   - {fileID: 8089210650133897920}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5609,6 +5686,66 @@ MonoBehaviour:
     - gameObject: {fileID: 7376704574898062582}
     - gameObject: {fileID: 5361362261105901452}
     - gameObject: {fileID: 3729610520836463702}
+  - key: fx_ui_pojing_loop
+    gameObject: {fileID: 7906287161833097796}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
+  - key: fx_ui_pojing_loop2
+    gameObject: {fileID: 7541718378471365227}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
+  - key: fx_ui_dujie_loop
+    gameObject: {fileID: 7299160934564795596}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
+  - key: AttributeBg
+    gameObject: {fileID: 3458075374136346509}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 1880288565177214262}
+    - gameObject: {fileID: 2042267790315149397}
+    - gameObject: {fileID: 4679966127718740453}
+    - gameObject: {fileID: 4142095966250220239}
+    - gameObject: {fileID: 7592152688635164121}
+    - gameObject: {fileID: 5851220315569675395}
+    - gameObject: {fileID: 4774715494878346207}
+    - gameObject: {fileID: 7376704574898062582}
+    - gameObject: {fileID: 5361362261105901452}
+    - gameObject: {fileID: 3729610520836463702}
   isAssetBundle: 1
 --- !u!1001 &508761963476317887
 PrefabInstance:
@@ -5764,10 +5901,18 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 332869841568630783, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 989068646213000240, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 989068646213000240, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1018189641606377850, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_Name
       value: fx_ui_pojing_loop
@@ -5780,10 +5925,18 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2579013666380289392, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7678339462657113129, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7678339462657113129, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -5818,15 +5971,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
       propertyPath: m_LocalPosition.x
@@ -5881,6 +6034,17 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+--- !u!114 &7906287161833097796 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 7686433970401715150, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
+  m_PrefabInstance: {fileID: 509879484065851786}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!224 &8229603176900455893 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 8441461819353252959, guid: c68c161e644c3f04ca6ec1bad4423743, type: 3}
@@ -6188,15 +6352,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1833723887958715827, guid: 102afa8162f5e4e49a46a6e552ee7cd8, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1833723887958715827, guid: 102afa8162f5e4e49a46a6e552ee7cd8, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1833723887958715827, guid: 102afa8162f5e4e49a46a6e552ee7cd8, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1833723887958715827, guid: 102afa8162f5e4e49a46a6e552ee7cd8, type: 3}
       propertyPath: m_LocalPosition.x
@@ -6803,6 +6967,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: DujiePanel
       objectReference: {fileID: 0}
+    - target: {fileID: 5203073339430596382, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5535801099866804413, guid: f0d7435468a46b24cb7bef41ae9507f6, type: 3}
       propertyPath: m_SortingLayer
       value: 0
@@ -7297,6 +7465,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 327590613993563087, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3562328547312358851, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Name
       value: fx_ui_pojing_loop2
@@ -7309,18 +7481,34 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6290195225587416253, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 6901419240082761364, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 6901419240082761364, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7014306529886958695, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7014306529886958695, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7294759689159795221, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7294759689159795221, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -7355,15 +7543,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
       propertyPath: m_LocalPosition.x
@@ -7423,6 +7611,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 8081526226586147832, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
   m_PrefabInstance: {fileID: 4561496863770152678}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &7541718378471365227 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 6333224163993851021, guid: 2e4c3b1f5e4a6664aaf70f89ab15ae8f, type: 3}
+  m_PrefabInstance: {fileID: 4561496863770152678}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &4810030704107047755
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7435,26 +7634,50 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 363762230357092613, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1885293269846349291, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 1885293269846349291, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4245232238392766855, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4245232238392766855, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4256680491009822893, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4256680491009822893, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4545691466786201691, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 4545691466786201691, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5106116416986984493, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5106116416986984493, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -7489,15 +7712,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_LocalScale.x
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_LocalScale.y
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_LocalScale.z
-      value: 216.53334
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
       propertyPath: m_LocalPosition.x
@@ -7565,6 +7788,17 @@ RectTransform:
   m_CorrespondingSourceObject: {fileID: 7687566245080699341, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
   m_PrefabInstance: {fileID: 4810030704107047755}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &7299160934564795596 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2849508913041203079, guid: 7417f94f35afcc84bbdb00635fa1c6f0, type: 3}
+  m_PrefabInstance: {fileID: 4810030704107047755}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 16f0b0b6d0b7542bfbd20a3e05b04ff1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1001 &4876959473941794782
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7719,6 +7953,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 71316726147915019, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4338634034337119778, guid: f074590ddce798040891e78f488f0d8c, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -7815,14 +8053,26 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5257712521978220578, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5260037861480216364, guid: f074590ddce798040891e78f488f0d8c, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5260037861480216364, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5828870007802736777, guid: f074590ddce798040891e78f488f0d8c, type: 3}
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 5828870007802736777, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7967601135237590799, guid: f074590ddce798040891e78f488f0d8c, type: 3}
       propertyPath: m_Name
       value: fx_ui_tupo1
@@ -7835,6 +8085,10 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 8547481310642698206, guid: f074590ddce798040891e78f488f0d8c, type: 3}
+      propertyPath: m_SortingLayer
+      value: 0
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

+ 1063 - 0
Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab

@@ -0,0 +1,1063 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &908498901687786849
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4363201749955246993}
+  - component: {fileID: 300703156522098652}
+  - component: {fileID: 3362068676485299346}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Tu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4363201749955246993
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908498901687786849}
+  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: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 11.2, y: 114.8}
+  m_SizeDelta: {x: 335, y: 662}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &300703156522098652
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908498901687786849}
+  m_CullTransparentMesh: 1
+--- !u!114 &3362068676485299346
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 908498901687786849}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  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_zi_djcg
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 189
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &1944986462689415960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1871334959253546311}
+  - component: {fileID: 8884516353508125679}
+  - component: {fileID: 9199402534891039922}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1871334959253546311
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944986462689415960}
+  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: 9037135992368401232}
+  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 &8884516353508125679
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944986462689415960}
+  m_CullTransparentMesh: 1
+--- !u!114 &9199402534891039922
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1944986462689415960}
+  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: b10fe3c1a9c5440458371368504f7b13, 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 &3432082845929337746
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2583264031236995806}
+  - component: {fileID: 4054036037674919989}
+  - component: {fileID: 7156210191863548860}
+  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 &2583264031236995806
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3432082845929337746}
+  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: 3479442316472032070}
+  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: 20.5, y: 0}
+  m_SizeDelta: {x: 28, y: 33}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4054036037674919989
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3432082845929337746}
+  m_CullTransparentMesh: 1
+--- !u!114 &7156210191863548860
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3432082845929337746}
+  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.9960785, g: 0.86666673, b: 0.50980395, a: 1}
+  m_RaycastTarget: 0
+  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_juqing_biaoshi1
+  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: 009d01eadc79b5b12c19322b6a4cd057
+  imageH: 32
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &4913753158075829455
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3479442316472032070}
+  - component: {fileID: 6122910395234630388}
+  - component: {fileID: 2306384484351467029}
+  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 &3479442316472032070
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4913753158075829455}
+  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: 543116040436373444}
+  - {fileID: 2583264031236995806}
+  - {fileID: 4092484107647895613}
+  - {fileID: 472811775746804830}
+  - {fileID: 1085220640693048462}
+  m_Father: {fileID: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: -174}
+  m_SizeDelta: {x: 676, y: 111}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &6122910395234630388
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4913753158075829455}
+  m_CullTransparentMesh: 1
+--- !u!114 &2306384484351467029
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4913753158075829455}
+  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: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  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_tp_jj_db
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 200
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &5294230650080845847
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4092484107647895613}
+  - component: {fileID: 7145965794220890925}
+  - component: {fileID: 499042528739118409}
+  - component: {fileID: 2922447034894237163}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_CurretnJIngjie
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4092484107647895613
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5294230650080845847}
+  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: 3479442316472032070}
+  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: -83.7, y: 0}
+  m_SizeDelta: {x: 308.2119, y: 48.487}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7145965794220890925
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5294230650080845847}
+  m_CullTransparentMesh: 1
+--- !u!114 &499042528739118409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5294230650080845847}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.90196085, g: 0.9607844, b: 0.9333334, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 46
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 46
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7B51\u57FA\u524D\u671F \u7B2C\u56DB\u91CD"
+--- !u!114 &2922447034894237163
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5294230650080845847}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &6015582386914595975
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8212670971040085124}
+  - component: {fileID: 4635955364539374710}
+  - component: {fileID: 4794340547222225426}
+  - component: {fileID: 7717169312912944238}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Btn_Close
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8212670971040085124
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  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: 9037135992368401232}
+  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 &4635955364539374710
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  m_CullTransparentMesh: 1
+--- !u!114 &4794340547222225426
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  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.003921569}
+  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
+--- !u!114 &7717169312912944238
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6015582386914595975}
+  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: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4794340547222225426}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &6059519925302326691
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8489357731499039436}
+  - component: {fileID: 4369372019103071337}
+  - component: {fileID: 7278925911318931419}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Dj
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &8489357731499039436
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6059519925302326691}
+  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: 9037135992368401232}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 21, y: 346}
+  m_SizeDelta: {x: 571, y: 230}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4369372019103071337
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6059519925302326691}
+  m_CullTransparentMesh: 1
+--- !u!114 &7278925911318931419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6059519925302326691}
+  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: 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: 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_dujiechenggong
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 230
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &6328008475876290341
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 472811775746804830}
+  - component: {fileID: 5249337868127242115}
+  - component: {fileID: 8021534401990309569}
+  - component: {fileID: 7766564801190356076}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &472811775746804830
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6328008475876290341}
+  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: 3479442316472032070}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 2}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5249337868127242115
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6328008475876290341}
+  m_CullTransparentMesh: 1
+--- !u!114 &8021534401990309569
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6328008475876290341}
+  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.4666667, g: 0.36078432, b: 0.24705884, 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_TupoFenGeXian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 2
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &7766564801190356076
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6328008475876290341}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &7371325538380333896
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 543116040436373444}
+  - component: {fileID: 4747113537948573547}
+  - component: {fileID: 4779532759236090049}
+  - component: {fileID: 2381540517331302103}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: 'Text_NextJIngjie '
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &543116040436373444
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  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: 3479442316472032070}
+  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: 241, y: 0}
+  m_SizeDelta: {x: 308.2119, y: 48.487}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4747113537948573547
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_CullTransparentMesh: 1
+--- !u!114 &4779532759236090049
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.95294124, g: 0.81568635, b: 0.47450984, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 46
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 3
+    m_MaxSize: 46
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u7B51\u57FA\u524D\u671F \u7B2C\u56DB\u91CD"
+--- !u!114 &2381540517331302103
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371325538380333896}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &8761311858942247224
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1085220640693048462}
+  - component: {fileID: 956848905564691411}
+  - component: {fileID: 8921433333291855242}
+  - component: {fileID: 4479323012423221125}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: myImage
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1085220640693048462
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8761311858942247224}
+  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: 3479442316472032070}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 2}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &956848905564691411
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8761311858942247224}
+  m_CullTransparentMesh: 1
+--- !u!114 &8921433333291855242
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8761311858942247224}
+  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.4666667, g: 0.36078432, b: 0.24705884, 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_TupoFenGeXian
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 192194a01f8a35742b246abac6b340ca, type: 3}
+  packInfo:
+    packName: jingjie
+    packgJsonPath: /Art/UIAssets/TextrueJson\jingjie.txt
+    packgSpritePath: Assets/Res/UIAtlas/jingjie.spriteatlasv2
+    lasetJsonGUID: a5790df98a45a640721da3160fc31d51
+  imageH: 2
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &4479323012423221125
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8761311858942247224}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
+--- !u!1 &8994874510214016950
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9037135992368401232}
+  - component: {fileID: 4159330424245520485}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: HeroTuPoSuccessPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9037135992368401232
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  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: 8212670971040085124}
+  - {fileID: 1871334959253546311}
+  - {fileID: 3479442316472032070}
+  - {fileID: 4363201749955246993}
+  - {fileID: 8489357731499039436}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &4159330424245520485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8994874510214016950}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: Btn_Close
+    gameObject: {fileID: 7717169312912944238}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_CurretnJIngjie
+    gameObject: {fileID: 499042528739118409}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: 'Text_NextJIngjie '
+    gameObject: {fileID: 4779532759236090049}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Tu
+    gameObject: {fileID: 3362068676485299346}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Dj
+    gameObject: {fileID: 7278925911318931419}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 0

+ 7 - 0
Assets/Res/UI/HeroInformainPanel/HeroTuPoSuccessPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XXMc5nikVHMYC4UBQxdgsvnc3Wf8pFGUooVP3jPJ6EsSaj4azqoZzUFoEPRo
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: herobreakthroughsuccesspanel
+  assetBundleVariant: 

BIN
Assets/Res/UI/HeroInformainPanel/修炼-渡劫成功.png


+ 2 - 2
Assets/Res/UI/HeroInformainPanel/道侣.png.meta → Assets/Res/UI/HeroInformainPanel/修炼-渡劫成功.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: XnJJsn+kUXsxhIdAjzkZ4/0SJfwyHqKHoul7G+Z6ODzOl6spv9aVBmPOiNHt
+guid: CX0asiylBynkya1VbEAFmvcpf4+FUP0bjeEWGBwsmh/+LsAXHSsL00SgL1Or
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: "\u9053\u4FA3"
+  assetBundleName: 
   assetBundleVariant: 

BIN
Assets/Res/UI/HeroInformainPanel/洞府-修炼.png


BIN
Assets/Res/UI/HeroInformainPanel/道侣.png


BIN
Assets/Res/UI/HeroInformainPanel/道侣邀请未选择.png


+ 1 - 0
Assets/Res/UIAtlas/fabao.spriteatlasv2

@@ -24,5 +24,6 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: b9734d55b2510ef47b701222e7a96be8, type: 3}
     - {fileID: 2800000, guid: 2dff6d61523a234458e80503fabd0388, type: 3}
     - {fileID: 2800000, guid: ddfae4554bb0298498d30493b4ec21ac, type: 3}
+    - {fileID: 2800000, guid: 4f2d1e51fbd1e06458504e11e75e9afb, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

+ 3 - 0
Assets/Res/UIAtlas/jingjie.spriteatlasv2

@@ -29,6 +29,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: c3d914222260cfd458cba8e41bf70166, type: 3}
     - {fileID: 2800000, guid: 3afed221e87e81941afbd8ee70a6444d, type: 3}
     - {fileID: 2800000, guid: 24e31eb2fcc012f409a51a9bf745be8f, type: 3}
+    - {fileID: 2800000, guid: c5fc122c8d6de2b4eb01a960ab1ff7bd, type: 3}
     - {fileID: 2800000, guid: b4ac1bb52f9d07540a89afcb37e6844f, type: 3}
     - {fileID: 2800000, guid: fd5def411aa419c4f8d6a32c6537d435, type: 3}
     - {fileID: 2800000, guid: 85f15bdcad7b87945b30275bf835d9f3, type: 3}
@@ -44,5 +45,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 5e1fad23ce704db4fbfba41d8500d1b7, type: 3}
     - {fileID: 2800000, guid: 7cfb6054634d3c34e9d34a734c4b932c, type: 3}
     - {fileID: 2800000, guid: ee280f8006611844cb167d306e060365, type: 3}
+    - {fileID: 2800000, guid: 4748709f25e845a408eca2ed826593ea, type: 3}
+    - {fileID: 2800000, guid: 678f5dc603ed27146ab2b59a937555c0, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

+ 30 - 0
Assets/Res/UIAtlas/touxiang.spriteatlasv2

@@ -0,0 +1,30 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!612988286 &1
+SpriteAtlasAsset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  serializedVersion: 3
+  m_MasterAtlas: {fileID: 0}
+  m_ImporterData:
+    packables:
+    - {fileID: 2800000, guid: ad3687ed48ac7b4438328c016fb4eed1, type: 3}
+    - {fileID: 2800000, guid: 8815174a2061b3a4b8e663cbced8b165, type: 3}
+    - {fileID: 2800000, guid: f32548fb1b5b25540b596ec31b842cf8, type: 3}
+    - {fileID: 2800000, guid: 40bc92db0e87c5945bcfd96654f4017f, type: 3}
+    - {fileID: 2800000, guid: 5a2a0855701411144b4743d2719b2adc, type: 3}
+    - {fileID: 2800000, guid: c9792ccc4f9a15d44999b1296c003f9c, type: 3}
+    - {fileID: 2800000, guid: 772f5a4130d0b6a4883214407d887f2a, type: 3}
+    - {fileID: 2800000, guid: 84f9496a97f22744cb89ae0c3a3a0cda, type: 3}
+    - {fileID: 2800000, guid: faf706ca8fda519438c518ee2e52c732, type: 3}
+    - {fileID: 2800000, guid: 906d2504e0802a941acbf00b0d5297cc, type: 3}
+    - {fileID: 2800000, guid: bd6e3c542b2e09d49b93ea5ab551e639, type: 3}
+    - {fileID: 2800000, guid: 8592d104f5b7b4b4a8cd5a182beda24a, type: 3}
+    - {fileID: 2800000, guid: 997351da0cdd7b04690ba1efe540e7a5, type: 3}
+    - {fileID: 2800000, guid: 9ae5600af3674954d87d7ee7c4b75f01, type: 3}
+    - {fileID: 2800000, guid: c6ec1b57208e6834489e5a251aaae330, type: 3}
+  m_IsVariant: 0
+  m_IsPlaceholder: 0

+ 31 - 0
Assets/Res/UIAtlas/touxiang.spriteatlasv2.meta

@@ -0,0 +1,31 @@
+fileFormatVersion: 2
+guid: Bi8XtXikU3KOkErAmsa46C33ui3bPr+oX9Ai/KTSNbkJY/vjdhJHPLWynHT8
+SpriteAtlasImporter:
+  externalObjects: {}
+  textureSettings:
+    serializedVersion: 3
+    anisoLevel: 1
+    compressionQuality: 50
+    maxTextureSize: 2048
+    textureCompression: 0
+    filterMode: 1
+    generateMipMaps: 0
+    readable: 0
+    crunchedCompression: 0
+    webStreaming: 0
+    sRGB: 1
+  platformSettings: []
+  packingSettings:
+    serializedVersion: 2
+    padding: 4
+    blockOffset: 1
+    allowAlphaSplitting: 0
+    enableRotation: 0
+    enableTightPacking: 0
+    enableAlphaDilation: 0
+  secondaryTextureSettings: {}
+  variantMultiplier: 1
+  bindAsDefault: 1
+  userData: 
+  assetBundleName: moban
+  assetBundleVariant: 

+ 31 - 2
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -507,8 +507,37 @@ namespace Fort23.Mono
                 if (_currShowTime > _showTime)
                 {
                     _currShowTime -= _showTime;
-                    _sb.Append(_currShowMessage[_currShowIndex]);
-                    _currShowIndex++;
+                    
+                    string v = _currShowMessage[_currShowIndex].ToString();
+                    if (v == "<")
+                    {
+                        int count = 0;
+                        int endIndex = 0;
+                        for (int i = _currShowIndex; i < _currShowMessage.Length - 1; i++)
+                        {
+                            count++;
+                            string ve = _currShowMessage[i].ToString();
+                            _sb.Append(ve);
+                            if (ve == ">")
+                            {
+                                string ve1 =  _currShowMessage[i - 1].ToString();
+                                if (ve1 == "r")
+                                {
+                                    endIndex = i;
+                                    break;
+                                }
+                            }
+                        }
+                        _currShowIndex += count;
+                    }
+                    else
+                    {
+                        _sb.Append(_currShowMessage[_currShowIndex]);
+                        _currShowIndex++;
+                    }
+                    
+                    
+                  
                     showText.text = _sb.ToString();
                 }
             }

+ 3 - 2
Assets/Scripts/GameUI/UI/DivineSence/DivineSenceInfoPanel.cs

@@ -150,20 +150,21 @@ namespace Fort23.Mono
             count = count + EventSystemManager.Instance.GetShenShiCount() > maxCount
                 ? maxCount - EventSystemManager.Instance.GetShenShiCount()
                 : count;
+            int mincount = count > 2 ? 2 : count;
 
 
             if (count == 1 || count == 0)
             {
                 Slider_Count.minValue = 0;
                 Slider_Count.maxValue = count;
-                Slider_Count.value = count;
+                Slider_Count.value = mincount;
                 Slider_Count.interactable = false;
             }
             else
             {
                 Slider_Count.minValue = 1;
                 Slider_Count.maxValue = count;
-                Slider_Count.value = count;
+                Slider_Count.value = mincount;
                 Slider_Count.interactable = true;
             }
 

+ 1 - 1
Assets/Scripts/GameUI/UI/GuidePanel/Phases/Phase9.cs

@@ -83,7 +83,7 @@ namespace Fort23.Mono.Phases
             await ctask;
             pgm.SetOnClickMask(false);
             CombatController.currActiveCombat.isUpdate = false;
-            GameObject gameObject = UIManager.Instance.GetComponent<CombatPanel>().magicWeapons[0].own;
+            GameObject gameObject = UIManager.Instance.GetComponent<CombatPanel>().magicWeapons[0].bg_hui.gameObject;
             Vector3 localPos = pgm.WorldPosToLocalPos(gameObject.transform.position);
             Vector2 size = gameObject.GetComponent<RectTransform>().sizeDelta;
 

+ 24 - 24
Assets/Scripts/GameUI/UI/HeroInformationPanel/HerYuanManSuccessPanel.cs

@@ -3,31 +3,31 @@ using Fort23.Core;
 
 namespace Fort23.Mono
 {
-	[UIBinding(prefab = "HerYuanManSuccessPanel"  )]
-	public partial class HerYuanManSuccessPanel : UIPanel
-	{
-		private void Init()
-		{
+    [UIBinding(prefab = "HerYuanManSuccessPanel")]
+    public partial class HerYuanManSuccessPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
 
-		}
-		protected override void AddEvent()
-		{
+        protected override void AddEvent()
+        {
+        }
 
-		}
-		protected override void DelEvent()
-		{
+        protected override void DelEvent()
+        {
+        }
 
-		}
-		public override void AddButtonEvent()
-		{
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
 
-		}
-		
-		public async static CTask<HerYuanManSuccessPanel> OpenPanel()
-		{
-			HerYuanManSuccessPanel heroBreakthroughSuccessPanel = await UIManager.Instance.LoadAndOpenPanel<HerYuanManSuccessPanel>(null, UILayer.Top, isFocus: false,isShowBG:true);
-			return heroBreakthroughSuccessPanel;
-		}
-
-	}
-}
+        public async static CTask<HerYuanManSuccessPanel> OpenPanel()
+        {
+            HerYuanManSuccessPanel heroBreakthroughSuccessPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HerYuanManSuccessPanel>(null, UILayer.Top);
+            return heroBreakthroughSuccessPanel;
+        }
+    }
+}

+ 0 - 11
Assets/Scripts/GameUI/UI/HeroInformationPanel/HerYuanManSuccessPanelData.cs

@@ -19,17 +19,6 @@ namespace Fort23.Mono
 	      return _Btn_Close;
 	     }
 	   }
-	  private Text _Text_NextJIngjie ;
-	  public Text Text_NextJIngjie 
-	   {
-	   get{
-	      if (_Text_NextJIngjie  == null)
-	       {
-	         _Text_NextJIngjie   = GetUIUnit<Text>("Text_NextJIngjie "); 
-	       }
-	      return _Text_NextJIngjie ;
-	     }
-	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 74 - 58
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroBreakthroughPanel.cs

@@ -68,6 +68,8 @@ namespace Fort23.Mono
                     return;
                 }
 
+                HeroInformationPanel heroInformationPanel =
+                    UIManager.Instance.GetComponent<HeroInformationPanel>();
                 if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == nextHeroInfo.powerUpConfig.jingjie1 ||
                     !PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
@@ -119,8 +121,6 @@ namespace Fort23.Mono
                             PlayerManager.Instance.myHero.powerUpConfig.DujieItemIDs[i], 1);
                     }
 
-                    HeroInformationPanel heroInformationPanel =
-                        UIManager.Instance.GetComponent<HeroInformationPanel>();
 
                     var list = GetBl();
 
@@ -141,11 +141,15 @@ namespace Fort23.Mono
 
                         if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 != nextHeroInfo.powerUpConfig.jingjie1)
                         {
+                            heroInformationPanel.root.SetActive(false);
+                            heroInformationPanel.AttributeBg.SetActive(false);
                             type1 = 4;
                         }
 
                         AudioManager.Instance.PlayAudio("ui_tupo.wav");
-                        await UpHero(type1);
+                        UIManager.Instance.HideUIUIPanel(this);
+                        TitlePanel.ClosePanel();
+                        heroInformationPanel.UpHero(type1, nextHeroInfo);
                     }
                     //失败
                     else
@@ -155,10 +159,9 @@ namespace Fort23.Mono
                         HeroBreakthroughFailPanel heroBreakthroughFailPanel =
                             await HeroBreakthroughFailPanel.OpenPanel(2, list[1]);
                         await heroBreakthroughFailPanel.UIClosed();
+                        heroInformationPanel.RecoverDujie();
+                        UIManager.Instance.HideUIUIPanel(this);
                     }
-
-                    heroInformationPanel.RecoverDujie();
-                    UIManager.Instance.HideUIUIPanel(this);
                 }
                 else
                 {
@@ -174,8 +177,7 @@ namespace Fort23.Mono
                         GObjectPoolInterface.SetActive(false);
                         BackgroundPanel backgroundPanel = UIManager.Instance.GetComponent<BackgroundPanel>();
                         backgroundPanel.GObjectPoolInterface.SetActive(false);
-                        HeroInformationPanel heroInformationPanel =
-                            UIManager.Instance.GetComponent<HeroInformationPanel>();
+
 
                         int ramdomValue = Random.Range(PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[0],
                             PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[1]);
@@ -189,16 +191,19 @@ namespace Fort23.Mono
                             HeroBreakthroughFailPanel heroBreakthroughFailPanel =
                                 await HeroBreakthroughFailPanel.OpenPanel(3, 100);
                             await heroBreakthroughFailPanel.UIClosed();
+                            heroInformationPanel.RecoverDujie();
+                            UIManager.Instance.HideUIUIPanel(this);
                         }
                         else
                         {
                             AudioManager.Instance.PlayAudio("ui_tupo.wav");
-                            await UpHero(3);
+                            heroInformationPanel.RecoverDujie();
+                            heroInformationPanel.root.SetActive(false);
+                            heroInformationPanel.AttributeBg.SetActive(true);
+                            UIManager.Instance.HideUIUIPanel(this);
+                            TitlePanel.ClosePanel();
+                            heroInformationPanel.UpHero(3, nextHeroInfo);
                         }
-
-
-                        heroInformationPanel.RecoverDujie();
-                        UIManager.Instance.HideUIUIPanel(this);
                     }
                 }
             });
@@ -249,48 +254,59 @@ namespace Fort23.Mono
             AccountFileInfo.Instance.SavePlayerData();
         }
 
-        private async CTask UpHero(int type)
-        {
-            List<HeroAttributeData> heroAttributData = null;
-            //小突破
-            if (type == 1)
-            {
-                heroAttributData =
-                    HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
-                PlayerManager.Instance.myHero.Upgrade();
-            }
-            //大突破
-            else if (type == 2)
-            {
-                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
-                PlayerManager.Instance.myHero.Upgrade();
-            }
-            //渡劫
-            else if (type == 3)
-            {
-                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
-                PlayerManager.Instance.myHero.heroData.isYuanMan = false;
-                PlayerManager.Instance.myHero.Upgrade();
-            }
-            //圆满
-            else if (type == 4)
-            {
-            }
-
-
-            if (type != 4)
-            {
-                HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
-                    await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
-                await heroBreakthroughSuccessPanel.UIClosed();
-            }
-            else
-            {
-                PlayerManager.Instance.myHero.heroData.isYuanMan = true;
-                HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
-                await herYuanManSuccessPanel.UIClosed();
-            }
-        }
+        // private async CTask UpHero(int type,HeroInfo nextHeroInfo)
+        // {
+        //     List<HeroAttributeData> heroAttributData = null;
+        //     //小突破
+        //     if (type == 1)
+        //     {
+        //         heroAttributData =
+        //             HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
+        //         PlayerManager.Instance.myHero.Upgrade();
+        //         HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+        //             await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+        //         await heroBreakthroughSuccessPanel.UIClosed();
+        //     }
+        //     //大突破
+        //     else if (type == 2)
+        //     {
+        //         heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+        //         PlayerManager.Instance.myHero.Upgrade();
+        //         HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+        //             await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+        //         await heroBreakthroughSuccessPanel.UIClosed();
+        //     }
+        //     //渡劫
+        //     else if (type == 3)
+        //     {
+        //         // heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+        //         PlayerManager.Instance.myHero.heroData.isYuanMan = false;
+        //         PlayerManager.Instance.myHero.Upgrade();
+        //         HeroTuPoSuccessPanel heroTuPoSuccessPanel = await HeroTuPoSuccessPanel.OpenPanel();
+        //         await heroTuPoSuccessPanel.UIClosed();
+        //     }
+        //     //圆满
+        //     else if (type == 4)
+        //     {
+        //         PlayerManager.Instance.myHero.heroData.isYuanMan = true;
+        //         HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
+        //         await herYuanManSuccessPanel.UIClosed();
+        //     }
+        //
+        //
+        //     // if (type != 4)
+        //     // {
+        //     //     HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+        //     //         await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+        //     //     await heroBreakthroughSuccessPanel.UIClosed();
+        //     // }
+        //     // else
+        //     // {
+        //     //     PlayerManager.Instance.myHero.heroData.isYuanMan = true;
+        //     //     HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
+        //     //     await herYuanManSuccessPanel.UIClosed();
+        //     // }
+        // }
 
 
         public async CTask CustomInit()
@@ -326,14 +342,14 @@ namespace Fort23.Mono
                 if (PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
                     Text_TitleName.text = LanguageManager.Instance.Text(10431);
-                    Text_Affirm.text =LanguageManager.Instance.Text(10432);
-                    Text_AffirmTips.text =LanguageManager.Instance.Text(10433);
+                    Text_Affirm.text = LanguageManager.Instance.Text(10432);
+                    Text_AffirmTips.text = LanguageManager.Instance.Text(10433);
                     Text_SucceedDesc.gameObject.SetActive(false);
                 }
                 else
                 {
                     Text_TitleName.text = LanguageManager.Instance.Text(10430);
-                    Text_Affirm.text = LanguageManager.Instance.Text(10432);
+                    Text_Affirm.text = LanguageManager.Instance.Text(10263);
                     Text_AffirmTips.text = LanguageManager.Instance.Text(10434);
                     Text_SucceedDesc.gameObject.SetActive(true);
                 }

+ 103 - 13
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanel.cs

@@ -11,6 +11,7 @@ using Fort23.UTool;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Hero;
 using UnityEngine;
+using UnityEngine.UI;
 using Utility.CTween;
 
 
@@ -126,7 +127,7 @@ namespace Fort23.Mono
                         fx_ui_tupo1.gameObject.SetActive(true);
                         fx_ui_tupo1.Play();
                         await TimerComponent.Instance.WaitAsync(500);
-                        CustomInit();
+
                         for (var i = 0; i < JingJieIcons.Count; i++)
                         {
                             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie3 - 1 == i)
@@ -143,28 +144,32 @@ namespace Fort23.Mono
 
                         fx_ui_tupo1.gameObject.SetActive(false);
                         MarskPanel.ClosePanel();
-                        HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
                         if (PlayerGuideManager.Instance.GuideIsCanDo(6, 3))
                         {
                             PlayerGuideManager.Instance.NextGuide();
                         }
 
+                        HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                            await HeroBreakthroughSuccessPanel.OpenPanel(1, heroAttributData);
+                        await heroBreakthroughSuccessPanel.UIClosed();
+                        CustomInit();
+
                         AudioManager.Instance.PlayAudio("ui_shengji.wav");
                     }
                     //大突破
                     else
                     {
                         HeroBreakthroughPanel heroBreakthroughPanel = await HeroBreakthroughPanel.OpenPanel();
-                        await heroBreakthroughPanel.UIClosed();
+                        // await heroBreakthroughPanel.UIClosed();
                         // PlayerManager.Instance.myHero.Upgrade();
-                        CustomInit();
+                        // CustomInit();
                     }
                 }
                 else
                 {
                     HeroBreakthroughPanel heroBreakthroughPanel = await HeroBreakthroughPanel.OpenPanel();
-                    await heroBreakthroughPanel.UIClosed();
-                    CustomInit();
+                    // await heroBreakthroughPanel.UIClosed();
+                    // CustomInit();
                     // TipMessagePanel.OpenTipMessagePanel("")
                 }
             });
@@ -323,30 +328,58 @@ namespace Fort23.Mono
                     PlayerManager.Instance.myHero.powerUpConfig.AutoXiuwei);
             }
 
+
+            //可以突破特效设置
+            fx_ui_tupo_loop.gameObject.SetActive(false);
+            fx_ui_pojing_loop.gameObject.SetActive(false);
+            fx_ui_pojing_loop2.gameObject.SetActive(false);
+            fx_ui_dujie_loop.gameObject.SetActive(false);
             if (PlayerManager.Instance.myHero.heroData.exp + allexp >=
                 PlayerManager.Instance.myHero.powerUpConfig.levelUpExp)
             {
-                fx_ui_tupo_loop.gameObject.SetActive(true);
-                fx_ui_tupo_loop.Play();
-            }
-            else
-            {
-                fx_ui_tupo_loop.gameObject.SetActive(false);
-                Btn_TuPo.transform.Gray();
+                if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1)
+                {
+                    //小突破
+                    if (PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
+                    {
+                        fx_ui_tupo_loop.gameObject.SetActive(true);
+                        fx_ui_tupo_loop.Play();
+                    }
+                    //破镜
+                    else
+                    {
+                        fx_ui_pojing_loop.Play();
+                        fx_ui_pojing_loop.gameObject.SetActive(true);
+                    }
+                }
+                //圆满
+                else if (!PlayerManager.Instance.myHero.heroData.isYuanMan)
+                {
+                    fx_ui_pojing_loop2.gameObject.SetActive(true);
+                    fx_ui_pojing_loop2.Play();
+                }
+                else if (PlayerManager.Instance.myHero.heroData.isYuanMan)
+                {
+                    fx_ui_dujie_loop.gameObject.SetActive(true);
+                    fx_ui_dujie_loop.Play();
+                }
             }
 
 
             Text_exp.text =
                 $"{(int)PlayerManager.Instance.myHero.exp.Value + allexp}/{PlayerManager.Instance.myHero.powerUpConfig.levelUpExp}";
 
+            //突破按钮图片和文字设置
             if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
                 PlayerManager.Instance.myHero.powerUpConfig.jingjie2 == heroInfo.powerUpConfig.jingjie2)
             {
+                Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo";
                 Text_TuPo.text = LanguageManager.Instance.Text(10228);
             }
             else if (PlayerManager.Instance.myHero.powerUpConfig.jingjie1 == heroInfo.powerUpConfig.jingjie1 &&
                      PlayerManager.Instance.myHero.powerUpConfig.jingjie2 != heroInfo.powerUpConfig.jingjie2)
             {
+                Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo";
                 Text_TuPo.text = "破镜";
             }
 
@@ -354,10 +387,12 @@ namespace Fort23.Mono
             {
                 if (PlayerManager.Instance.myHero.heroData.isYuanMan)
                 {
+                    Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianDujie";
                     Text_TuPo.text = LanguageManager.Instance.Text(10229);
                 }
                 else
                 {
+                    Btn_TuPo.GetComponent<MyImage>().icon_name = "btn_xiulianTupo2";
                     Text_TuPo.text = LanguageManager.Instance.Text(10228);
                 }
             }
@@ -515,6 +550,7 @@ namespace Fort23.Mono
         public async CTask Dujie(int hart)
         {
             root.SetActive(false);
+            AttributeBg.SetActive(false);
             using (CTaskAwaitBuffer<ShowTextWidget> cTaskAwaitBuffer = new CTaskAwaitBuffer<ShowTextWidget>())
             {
                 for (int i = 0; i < PlayerManager.Instance.myHero.powerUpConfig.LeijieDamages[2]; i++)
@@ -571,6 +607,60 @@ namespace Fort23.Mono
         {
             DujiePanelAnim.Play("guodu_idle");
             root.SetActive(true);
+            AttributeBg.SetActive(true);
+        }
+
+
+        public async CTask UpHero(int type, HeroInfo nextHeroInfo)
+        {
+            HeroInformationPanel heroInformationPanel =
+                UIManager.Instance.GetComponent<HeroInformationPanel>();
+            List<HeroAttributeData> heroAttributData = null;
+            //小突破
+            if (type == 1)
+            {
+                heroAttributData =
+                    HeroHerlp.GetHeroChageHeroAttributeData1(PlayerManager.Instance.myHero, nextHeroInfo);
+                PlayerManager.Instance.myHero.Upgrade();
+                HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                    await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+                await heroBreakthroughSuccessPanel.UIClosed();
+            }
+            //大突破
+            else if (type == 2)
+            {
+                heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+                PlayerManager.Instance.myHero.Upgrade();
+                HeroBreakthroughSuccessPanel heroBreakthroughSuccessPanel =
+                    await HeroBreakthroughSuccessPanel.OpenPanel(type, heroAttributData);
+                await heroBreakthroughSuccessPanel.UIClosed();
+                CustomInit();
+                TitlePanel.OpenPanel();
+            }
+            //渡劫
+            else if (type == 3)
+            {
+                // heroAttributData = HeroHerlp.GetHeroChageHeroAttributeData(PlayerManager.Instance.myHero, nextHeroInfo);
+                PlayerManager.Instance.myHero.heroData.isYuanMan = false;
+                PlayerManager.Instance.myHero.Upgrade();
+                HeroTuPoSuccessPanel heroTuPoSuccessPanel = await HeroTuPoSuccessPanel.OpenPanel();
+                await heroTuPoSuccessPanel.UIClosed();
+                heroInformationPanel.root.SetActive(true);
+                heroInformationPanel.AttributeBg.SetActive(true);
+                CustomInit();
+                TitlePanel.OpenPanel();
+            }
+            //圆满
+            else if (type == 4)
+            {
+                PlayerManager.Instance.myHero.heroData.isYuanMan = true;
+                HerYuanManSuccessPanel herYuanManSuccessPanel = await HerYuanManSuccessPanel.OpenPanel();
+                await herYuanManSuccessPanel.UIClosed();
+                heroInformationPanel.root.SetActive(true);
+                heroInformationPanel.AttributeBg.SetActive(true);
+                CustomInit();
+                TitlePanel.OpenPanel();
+            }
         }
     }
 }

+ 44 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroInformationPanelData.cs

@@ -362,6 +362,50 @@ namespace Fort23.Mono
 	      return _fx_ui_danyao_shi;
 	     }
 	   }
+	  private UIParticle _fx_ui_pojing_loop;
+	  public UIParticle fx_ui_pojing_loop
+	   {
+	   get{
+	      if (_fx_ui_pojing_loop == null)
+	       {
+	         _fx_ui_pojing_loop  = GetUIUnit<UIParticle>("fx_ui_pojing_loop"); 
+	       }
+	      return _fx_ui_pojing_loop;
+	     }
+	   }
+	  private UIParticle _fx_ui_pojing_loop2;
+	  public UIParticle fx_ui_pojing_loop2
+	   {
+	   get{
+	      if (_fx_ui_pojing_loop2 == null)
+	       {
+	         _fx_ui_pojing_loop2  = GetUIUnit<UIParticle>("fx_ui_pojing_loop2"); 
+	       }
+	      return _fx_ui_pojing_loop2;
+	     }
+	   }
+	  private UIParticle _fx_ui_dujie_loop;
+	  public UIParticle fx_ui_dujie_loop
+	   {
+	   get{
+	      if (_fx_ui_dujie_loop == null)
+	       {
+	         _fx_ui_dujie_loop  = GetUIUnit<UIParticle>("fx_ui_dujie_loop"); 
+	       }
+	      return _fx_ui_dujie_loop;
+	     }
+	   }
+	  private GameObject _AttributeBg;
+	  public GameObject AttributeBg
+	   {
+	   get{
+	      if (_AttributeBg == null)
+	       {
+	         _AttributeBg  = GetUIUnit<GameObject>("AttributeBg"); 
+	       }
+	      return _AttributeBg;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

+ 52 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanel.cs

@@ -0,0 +1,52 @@
+using System.Collections.Generic;
+using Core.Language;
+using Fort23.Core;
+using GameLogic.Hero;
+using UnityEngine;
+using UnityEngine.UI;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "HeroTuPoSuccessPanel")]
+    public partial class HeroTuPoSuccessPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            Btn_Close.onClick.AddListener(() => { UIManager.Instance.HideUIUIPanel(this); });
+        }
+
+        public async static CTask<HeroTuPoSuccessPanel> OpenPanel()
+        {
+            HeroTuPoSuccessPanel heroBreakthroughSuccessPanel =
+                await UIManager.Instance.LoadAndOpenPanel<HeroTuPoSuccessPanel>(null, UILayer.Top);
+            heroBreakthroughSuccessPanel.CustomInit();
+            return heroBreakthroughSuccessPanel;
+        }
+
+        public async void CustomInit()
+        {
+            // HeroInfo heroInfo = new HeroInfo();
+            HeroInfo heroInfo = PlayerManager.Instance.myHero.CopyHero();
+            heroInfo.InitHero(PlayerManager.Instance.myHero.heroData.heroModelId,
+                PlayerManager.Instance.myHero.heroData.heroPowerId - 1);
+            Text_NextJIngjie.text =
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[0]) +
+                LanguageManager.Instance.Text(PlayerManager.Instance.myHero.powerUpConfig.jingjieLanIDs[1]);
+
+            Text_CurretnJIngjie.text = LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[0]) +
+                                       LanguageManager.Instance.Text(heroInfo.powerUpConfig.jingjieLanIDs[1]);
+        }
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: W35N5C6sBnhYQSxruE9pmTHvbTtUoZXNTFDTaAWjgKW2eMXmSjZul93RlgGo
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 73 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanelData.cs

@@ -0,0 +1,73 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class HeroTuPoSuccessPanel 
+	{
+	  #region 自定义数据 
+	  private Button _Btn_Close;
+	  public Button Btn_Close
+	   {
+	   get{
+	      if (_Btn_Close == null)
+	       {
+	         _Btn_Close  = GetUIUnit<Button>("Btn_Close"); 
+	       }
+	      return _Btn_Close;
+	     }
+	   }
+	  private Text _Text_CurretnJIngjie;
+	  public Text Text_CurretnJIngjie
+	   {
+	   get{
+	      if (_Text_CurretnJIngjie == null)
+	       {
+	         _Text_CurretnJIngjie  = GetUIUnit<Text>("Text_CurretnJIngjie"); 
+	       }
+	      return _Text_CurretnJIngjie;
+	     }
+	   }
+	  private Text _Text_NextJIngjie ;
+	  public Text Text_NextJIngjie 
+	   {
+	   get{
+	      if (_Text_NextJIngjie  == null)
+	       {
+	         _Text_NextJIngjie   = GetUIUnit<Text>("Text_NextJIngjie "); 
+	       }
+	      return _Text_NextJIngjie ;
+	     }
+	   }
+	  private MyImage _Icon_Tu;
+	  public MyImage Icon_Tu
+	   {
+	   get{
+	      if (_Icon_Tu == null)
+	       {
+	         _Icon_Tu  = GetUIUnit<MyImage>("Icon_Tu"); 
+	       }
+	      return _Icon_Tu;
+	     }
+	   }
+	  private MyImage _Icon_Dj;
+	  public MyImage Icon_Dj
+	   {
+	   get{
+	      if (_Icon_Dj == null)
+	       {
+	         _Icon_Dj  = GetUIUnit<MyImage>("Icon_Dj"); 
+	       }
+	      return _Icon_Dj;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/HeroInformationPanel/HeroTuPoSuccessPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: DnNMvHyrBXtgC7MZoDE8MkaBRifuZbODsezsiOdz5qPzDdp0V5texB2LE+YB
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 0 - 7
Assets/StreamingAssets/assetBundle.zip.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/EventConfig.xlsx


BIN
Excel2Json/Excel/HeroModel.xlsx


BIN
Excel2Json/Excel/Item.xlsx


BIN
Excel2Json/Excel/Language.xlsx


BIN
Excel2Json/Excel/MonsterPowerUp.xlsx


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
UGUIPack/uguiconfig.db


Dosya farkı çok büyük olduğundan ihmal edildi
+ 0 - 0
美术/unity_use_ui/TextrueJson/jingjie.txt


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

@@ -1 +1 @@
-{"packName":"touxiang","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx1001","filePath":"/icon/icon_tx1001.png"},{"textrueName":"icon_tx1003","filePath":"/icon/icon_tx1003.png"},{"textrueName":"icon_tx1005","filePath":"/icon/icon_tx1005.png"},{"textrueName":"icon_tx1006","filePath":"/icon/icon_tx1006.png"},{"textrueName":"icon_tx1007","filePath":"/icon/icon_tx1007.png"},{"textrueName":"icon_tx1008","filePath":"/icon/icon_tx1008.png"},{"textrueName":"icon_tx101","filePath":"/icon/icon_tx101.png"},{"textrueName":"icon_tx5006","filePath":"/icon/icon_tx5006.png"},{"textrueName":"icon_tx5007","filePath":"/icon/icon_tx5007.png"},{"textrueName":"icon_tx9001","filePath":"/icon/icon_tx9001.png"},{"textrueName":"icon_tx9002","filePath":"/icon/icon_tx9002.png"},{"textrueName":"icon_tx9003","filePath":"/icon/icon_tx9003.png"},{"textrueName":"icon_tx9004","filePath":"/icon/icon_tx9004.png"},{"textrueName":"icon_tx9006","filePath":"/icon/icon_tx9006.png"}],"keyToValue":{}}
+{"packName":"touxiang","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx1001","filePath":"/icon/icon_tx1001.png"},{"textrueName":"icon_tx1003","filePath":"/icon/icon_tx1003.png"},{"textrueName":"icon_tx1005","filePath":"/icon/icon_tx1005.png"},{"textrueName":"icon_tx1006","filePath":"/icon/icon_tx1006.png"},{"textrueName":"icon_tx1007","filePath":"/icon/icon_tx1007.png"},{"textrueName":"icon_tx1008","filePath":"/icon/icon_tx1008.png"},{"textrueName":"icon_tx101","filePath":"/icon/icon_tx101.png"},{"textrueName":"icon_tx5006","filePath":"/icon/icon_tx5006.png"},{"textrueName":"icon_tx5007","filePath":"/icon/icon_tx5007.png"},{"textrueName":"icon_tx9001","filePath":"/icon/icon_tx9001.png"},{"textrueName":"icon_tx9002","filePath":"/icon/icon_tx9002.png"},{"textrueName":"icon_tx9003","filePath":"/icon/icon_tx9003.png"},{"textrueName":"icon_tx9004","filePath":"/icon/icon_tx9004.png"},{"textrueName":"icon_tx9005","filePath":"/icon/icon_tx9005.png"},{"textrueName":"icon_tx9006","filePath":"/icon/icon_tx9006.png"}],"keyToValue":{}}

BIN
美术/unity_use_ui/bg/bg_lh_queyinger.png


BIN
美术/unity_use_ui/decorate/dec_tp_jj_db.png


BIN
美术/unity_use_ui/decorate/dec_zi_djcg.png


BIN
美术/unity_use_ui/decorate/dec_zi_jjym.png


BIN
美术/unity_use_ui/icon/icon_tx9005.png


Bu fark içinde çok fazla dosya değişikliği olduğu için bazı dosyalar gösterilmiyor