Browse Source

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by origin/master(远端) version
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version
李桃 3 days ago
parent
commit
5d8ee2c97d
100 changed files with 11711 additions and 1316 deletions
  1. BIN
      Assets/Art/UIAssets/Button/btn_quxiao.png
  2. 2 2
      Assets/Art/UIAssets/Button/btn_quxiao.png.meta
  3. 1 0
      Assets/Art/UIAssets/TextrueJson/fabao.txt
  4. 1 1
      Assets/Art/UIAssets/TextrueJson/fabao.txt.meta
  5. 1 1
      Assets/Art/UIAssets/TextrueJson/gongfa.txt
  6. 0 0
      Assets/Art/UIAssets/TextrueJson/skillIcon.txt
  7. 0 0
      Assets/Art/UIAssets/TextrueJson/tongyong.txt
  8. BIN
      Assets/Art/UIAssets/decorate/dec_fbBiaotiDIban.png
  9. 203 0
      Assets/Art/UIAssets/decorate/dec_fbBiaotiDIban.png.meta
  10. BIN
      Assets/Art/UIAssets/decorate/dec_fbDengjiDiban.png
  11. 203 0
      Assets/Art/UIAssets/decorate/dec_fbDengjiDiban.png.meta
  12. BIN
      Assets/Art/UIAssets/decorate/dec_fbDiban.png
  13. 203 0
      Assets/Art/UIAssets/decorate/dec_fbDiban.png.meta
  14. BIN
      Assets/Art/UIAssets/decorate/dec_fbGuangbian.png
  15. 203 0
      Assets/Art/UIAssets/decorate/dec_fbGuangbian.png.meta
  16. BIN
      Assets/Art/UIAssets/decorate/dec_fbXuanzhe.png
  17. 203 0
      Assets/Art/UIAssets/decorate/dec_fbXuanzhe.png.meta
  18. BIN
      Assets/Art/UIAssets/decorate/dec_fbZhuangbeiDiban.png
  19. 203 0
      Assets/Art/UIAssets/decorate/dec_fbZhuangbeiDiban.png.meta
  20. BIN
      Assets/Art/UIAssets/decorate/dec_fbfangyu.png
  21. 203 0
      Assets/Art/UIAssets/decorate/dec_fbfangyu.png.meta
  22. BIN
      Assets/Art/UIAssets/decorate/dec_fbgong.png
  23. 203 0
      Assets/Art/UIAssets/decorate/dec_fbgong.png.meta
  24. BIN
      Assets/Art/UIAssets/decorate/dec_fbjia.png
  25. 203 0
      Assets/Art/UIAssets/decorate/dec_fbjia.png.meta
  26. BIN
      Assets/Art/UIAssets/decorate/dec_fbjian.png
  27. 203 0
      Assets/Art/UIAssets/decorate/dec_fbjian.png.meta
  28. BIN
      Assets/Art/UIAssets/decorate/dec_fbshuziDiban.png
  29. 203 0
      Assets/Art/UIAssets/decorate/dec_fbshuziDiban.png.meta
  30. BIN
      Assets/Art/UIAssets/decorate/dec_fbxiaDiban.png
  31. 203 0
      Assets/Art/UIAssets/decorate/dec_fbxiaDiban.png.meta
  32. BIN
      Assets/Art/UIAssets/decorate/dec_fbxue.png
  33. 203 0
      Assets/Art/UIAssets/decorate/dec_fbxue.png.meta
  34. BIN
      Assets/Art/UIAssets/decorate/dec_fbzhongDiban.png
  35. 203 0
      Assets/Art/UIAssets/decorate/dec_fbzhongDiban.png.meta
  36. 1 1
      Assets/Art/UIAssets/decorate/dec_tiaomulandiban.png.meta
  37. 0 0
      Assets/Art/UIAssets/icon/icon_fb3101.png
  38. 203 0
      Assets/Art/UIAssets/icon/icon_fb3101.png.meta
  39. BIN
      Assets/Art/UIAssets/icon/icon_fb3201.png
  40. 203 0
      Assets/Art/UIAssets/icon/icon_fb3201.png.meta
  41. BIN
      Assets/Art/UIAssets/icon/icon_fb3202.png
  42. 203 0
      Assets/Art/UIAssets/icon/icon_fb3202.png.meta
  43. 0 0
      Assets/Art/UIAssets/icon/icon_fb3301.png
  44. 203 0
      Assets/Art/UIAssets/icon/icon_fb3301.png.meta
  45. BIN
      Assets/Art/UIAssets/icon/icon_fb3401.png
  46. 203 0
      Assets/Art/UIAssets/icon/icon_fb3401.png.meta
  47. BIN
      Assets/Art/UIAssets/icon/icon_fb3402.png
  48. 203 0
      Assets/Art/UIAssets/icon/icon_fb3402.png.meta
  49. BIN
      Assets/Art/UIAssets/icon/icon_fb3501.png
  50. 203 0
      Assets/Art/UIAssets/icon/icon_fb3501.png.meta
  51. BIN
      Assets/Art/UIAssets/icon/icon_skill_3101.png
  52. 203 0
      Assets/Art/UIAssets/icon/icon_skill_3101.png.meta
  53. BIN
      Assets/Art/UIAssets/icon/icon_skill_3201.png
  54. 203 0
      Assets/Art/UIAssets/icon/icon_skill_3201.png.meta
  55. BIN
      Assets/Art/UIAssets/icon/icon_skill_3202.png
  56. 203 0
      Assets/Art/UIAssets/icon/icon_skill_3202.png.meta
  57. BIN
      Assets/Art/UIAssets/icon/icon_skill_3301.png
  58. 203 0
      Assets/Art/UIAssets/icon/icon_skill_3301.png.meta
  59. BIN
      Assets/Art/UIAssets/icon/icon_skill_3401.png
  60. 203 0
      Assets/Art/UIAssets/icon/icon_skill_3401.png.meta
  61. BIN
      Assets/Art/UIAssets/icon/icon_skill_3501.png
  62. 203 0
      Assets/Art/UIAssets/icon/icon_skill_3501.png.meta
  63. 12 1
      Assets/Editor/CombatEditor/HeroEntityCombatReport.cs
  64. 115 19
      Assets/Res/Config/EventConfig.json
  65. 174 22
      Assets/Res/Config/EventLinkConfig.json
  66. 7 0
      Assets/Res/Config/EventLinkConfig.json.meta
  67. 56 71
      Assets/Res/Config/FabaoPowerupConfig.json
  68. 4 4
      Assets/Res/Config/HeroModelConfig.json
  69. 115 115
      Assets/Res/Config/HeroPowerUpConfig.json
  70. 246 246
      Assets/Res/Config/LanguageChineseConfig.json
  71. 224 224
      Assets/Res/Config/MonsterPowerUpConfig.json
  72. 3004 0
      Assets/Res/Config/ResourceLevelConfig.json
  73. 7 0
      Assets/Res/Config/ResourceLevelConfig.json.meta
  74. 233 256
      Assets/Res/Config/SkillConfig.json
  75. 80 0
      Assets/Res/Config/TaskConfig.json
  76. 7 0
      Assets/Res/Config/TaskConfig.json.meta
  77. BIN
      Assets/Res/UI/MainHeroPanel/7e504e2eddd927a85270d0ff0b6362fa.png
  78. 37 53
      Assets/Res/UI/MainHeroPanel/FaBaoAttributeWidget.prefab
  79. 190 96
      Assets/Res/UI/MainHeroPanel/FaBaoSkillWidget.prefab
  80. 167 27
      Assets/Res/UI/MainHeroPanel/FaBaoWidget.prefab
  81. 329 127
      Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab
  82. 5 5
      Assets/Res/UI/SkillSelectPanel/Btn_UpStar.prefab
  83. 10 10
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradeInfoWidget.prefab
  84. 10 10
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab
  85. 8 0
      Assets/Res/UI/Task.meta
  86. 966 0
      Assets/Res/UI/Task/TaskInfoPanel.prefab
  87. 7 0
      Assets/Res/UI/Task/TaskInfoPanel.prefab.meta
  88. 1 1
      Assets/Res/UI/WidgetItem.prefab
  89. 29 0
      Assets/Res/UIAtlas/fabao.spriteatlasv2
  90. 31 0
      Assets/Res/UIAtlas/fabao.spriteatlasv2.meta
  91. 0 4
      Assets/Res/UIAtlas/gongfa.spriteatlasv2
  92. 6 0
      Assets/Res/UIAtlas/skillIcon.spriteatlasv2
  93. 5 0
      Assets/Res/UIAtlas/tongyong.spriteatlasv2
  94. 15 7
      Assets/Scenes/testCombat.scene
  95. 9 2
      Assets/Scripts/Core/BattleReport/BattleReportValueDataModule.cs
  96. 13 1
      Assets/Scripts/Core/Event/Event/CustomEventType.cs
  97. 8 2
      Assets/Scripts/GameData/ExcelConfig/EventConfig.cs
  98. 25 7
      Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs
  99. 1 1
      Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs.meta
  100. 68 0
      Assets/Scripts/GameData/ExcelConfig/ResourceLevelConfig.cs

BIN
Assets/Art/UIAssets/Button/btn_quxiao.png


+ 2 - 2
Assets/Res/UI/MainHeroPanel/7e504e2eddd927a85270d0ff0b6362fa.png.meta → Assets/Art/UIAssets/Button/btn_quxiao.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: DStNsS7+V3JAZ6ZOE2r8jcp4OPQrtzIqgQ3PwxSZLi5gP1KXnQpwMWBXUl/o
+guid: CnJO5n6oAS98fwe+ZCpfADK1UAPQjBbDuH36w9iJwQ2kQ6/1xLA9Wer7fNue
 TextureImporter:
 TextureImporter:
   internalIDToNameTable: []
   internalIDToNameTable: []
   externalObjects: {}
   externalObjects: {}
@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     mipBias: 0
     wrapU: 1
     wrapU: 1
     wrapV: 1
     wrapV: 1
-    wrapW: 0
+    wrapW: 1
   nPOTScale: 0
   nPOTScale: 0
   lightmap: 0
   lightmap: 0
   compressionQuality: 50
   compressionQuality: 50

+ 1 - 0
Assets/Art/UIAssets/TextrueJson/fabao.txt

@@ -0,0 +1 @@
+{"packName":"fabao","isTyPack":false,"newTextureJson":[{"textrueName":"dec_fbBiaotiDIban","filePath":"/decorate/dec_fbBiaotiDIban.png"},{"textrueName":"dec_fbDengjiDiban","filePath":"/decorate/dec_fbDengjiDiban.png"},{"textrueName":"dec_fbDiban","filePath":"/decorate/dec_fbDiban.png"},{"textrueName":"dec_fbfangyu","filePath":"/decorate/dec_fbfangyu.png"},{"textrueName":"dec_fbgong","filePath":"/decorate/dec_fbgong.png"},{"textrueName":"dec_fbGuangbian","filePath":"/decorate/dec_fbGuangbian.png"},{"textrueName":"dec_fbjia","filePath":"/decorate/dec_fbjia.png"},{"textrueName":"dec_fbjian","filePath":"/decorate/dec_fbjian.png"},{"textrueName":"dec_fbshuziDiban","filePath":"/decorate/dec_fbshuziDiban.png"},{"textrueName":"dec_fbxiaDiban","filePath":"/decorate/dec_fbxiaDiban.png"},{"textrueName":"dec_fbXuanzhe","filePath":"/decorate/dec_fbXuanzhe.png"},{"textrueName":"dec_fbxue","filePath":"/decorate/dec_fbxue.png"},{"textrueName":"dec_fbzhongDiban","filePath":"/decorate/dec_fbzhongDiban.png"},{"textrueName":"dec_fbZhuangbeiDiban","filePath":"/decorate/dec_fbZhuangbeiDiban.png"}],"keyToValue":{}}

+ 1 - 1
Assets/Res/Config/EventConditionConfig.json.meta → Assets/Art/UIAssets/TextrueJson/fabao.txt.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: ByhK43mqB3rviyN3a2SgkOzNP/n71UkJZhczbeAcUf+pctv3aitXpDv2/U1s
+guid: Cn0WtnmuBXyZUrn23yT2wI/okREsgT1iV8YIREB+1gL4ha2nQ/PIQtwil6L+
 TextScriptImporter:
 TextScriptImporter:
   externalObjects: {}
   externalObjects: {}
   userData: 
   userData: 

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

@@ -1 +1 @@
-{"packName":"gongfa","isTyPack":false,"newTextureJson":[{"textrueName":"btn_lingwu","filePath":"/Button/btn_lingwu.png"},{"textrueName":"btn_shengji","filePath":"/Button/btn_shengji.png"},{"textrueName":"dec_diban","filePath":"/decorate/dec_diban.png"},{"textrueName":"dec_gfdengjidiban","filePath":"/decorate/dec_gfdengjidiban.png"},{"textrueName":"dec_gfdiban","filePath":"/decorate/dec_gfdiban.png"},{"textrueName":"dec_gficondiban","filePath":"/decorate/dec_gficondiban.png"},{"textrueName":"dec_gfLVdiban","filePath":"/decorate/dec_gfLVdiban.png"},{"textrueName":"dec_gfnamediban","filePath":"/decorate/dec_gfnamediban.png"},{"textrueName":"dec_gfxingji","filePath":"/decorate/dec_gfxingji.png"},{"textrueName":"dec_gfxingjidiban","filePath":"/decorate/dec_gfxingjidiban.png"},{"textrueName":"dec_gfxxdiban","filePath":"/decorate/dec_gfxxdiban.png"},{"textrueName":"dec_gfxxlanXuanzhong","filePath":"/decorate/dec_gfxxlanXuanzhong.png"},{"textrueName":"dec_jiantou","filePath":"/decorate/dec_jiantou.png"},{"textrueName":"dec_moni","filePath":"/decorate/dec_moni.png"},{"textrueName":"dec_shangdiban","filePath":"/decorate/dec_shangdiban.png"},{"textrueName":"dec_shuliangdiban","filePath":"/decorate/dec_shuliangdiban.png"},{"textrueName":"dec_tiaomulandiban","filePath":"/decorate/dec_tiaomulandiban.png"},{"textrueName":"dec_tiaozheng","filePath":"/decorate/dec_tiaozheng.png"},{"textrueName":"dec_weixuanzhong","filePath":"/decorate/dec_weixuanzhong.png"},{"textrueName":"dec_xiadiban","filePath":"/decorate/dec_xiadiban.png"},{"textrueName":"dec_xuanzhong","filePath":"/decorate/dec_xuanzhong.png"},{"textrueName":"dec_zhongdiban","filePath":"/decorate/dec_zhongdiban.png"}],"keyToValue":{}}
+{"packName":"gongfa","isTyPack":false,"newTextureJson":[{"textrueName":"dec_diban","filePath":"/decorate/dec_diban.png"},{"textrueName":"dec_gfdengjidiban","filePath":"/decorate/dec_gfdengjidiban.png"},{"textrueName":"dec_gfdiban","filePath":"/decorate/dec_gfdiban.png"},{"textrueName":"dec_gficondiban","filePath":"/decorate/dec_gficondiban.png"},{"textrueName":"dec_gfLVdiban","filePath":"/decorate/dec_gfLVdiban.png"},{"textrueName":"dec_gfnamediban","filePath":"/decorate/dec_gfnamediban.png"},{"textrueName":"dec_gfxingji","filePath":"/decorate/dec_gfxingji.png"},{"textrueName":"dec_gfxingjidiban","filePath":"/decorate/dec_gfxingjidiban.png"},{"textrueName":"dec_gfxxdiban","filePath":"/decorate/dec_gfxxdiban.png"},{"textrueName":"dec_gfxxlanXuanzhong","filePath":"/decorate/dec_gfxxlanXuanzhong.png"},{"textrueName":"dec_jiantou","filePath":"/decorate/dec_jiantou.png"},{"textrueName":"dec_moni","filePath":"/decorate/dec_moni.png"},{"textrueName":"dec_shangdiban","filePath":"/decorate/dec_shangdiban.png"},{"textrueName":"dec_shuliangdiban","filePath":"/decorate/dec_shuliangdiban.png"},{"textrueName":"dec_tiaozheng","filePath":"/decorate/dec_tiaozheng.png"},{"textrueName":"dec_weixuanzhong","filePath":"/decorate/dec_weixuanzhong.png"},{"textrueName":"dec_xuanzhong","filePath":"/decorate/dec_xuanzhong.png"},{"textrueName":"dec_zhongdiban","filePath":"/decorate/dec_zhongdiban.png"}],"keyToValue":{}}

File diff suppressed because it is too large
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/skillIcon.txt


File diff suppressed because it is too large
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


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


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DHIZsH78BSiFfq4efI1yGOo6NlFBi9OLcY1mol2FNwka/M14/TaDXh7ripdx
+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_fbDengjiDiban.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Bi9Nsin+BX1p2qc1tT16yX1IpOxLVFYkpej7YNhcRpWCOkf32iUyCNDLBPli
+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_fbDiban.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Dnwa5H75UC0FnzLC2MSBSCsFcCD/iJ3MRWytgabkPHYQkAke32o/viEFongY
+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_fbGuangbian.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DHNKsy2pUHir6kpHysUFqMIuWy6/H8Q0P3xwzS7H8YqJ9OlqCSZ4dJ4wv2F/
+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_fbXuanzhe.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CitM4y/8UHL7+rLRLS8ugXEjDWCzHHCFJUA0LvZxn2KcayYW8PVHn2ngiWwH
+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_fbZhuangbeiDiban.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Wy5J5H+pVn7a4JdX2az7QxWBPVuf3qrt1T096On8JggSynoMPjTI9r45WrJt
+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_fbfangyu.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Ci5J4Sn7UX62pFmlxKMQ+dLlbQM8gQKipdn5xnSWk5ndz5NImY9yC9as5vB5
+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_fbgong.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DixNtHv/V34E9euVPqs3N3Vsx2iJ0U4PakBXif5mta7rIsqiByhff+CEwVJp
+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_fbjia.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CC8YtiukB3JjfPjIm0adzxIWIlJliZ1wovj1CfMpzPsto6PfAvojSptWlpjM
+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_fbjian.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XigWsCKuUnx+rKR9Oa96qIwnOHMLIMo3RIfsjrtwMdXFHY66/R9eIjiPSTzs
+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_fbshuziDiban.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: B3gWvH+rUHhJ8vMfDMj0lyXcTkb2JX/1QX/Szsp/Vu121wl3Npq08/mAhULp
+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_fbxiaDiban.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DSge4yv/VH770RcRZfeWam+swX87MpSdLHWpU0qKUAZfeFXPCJUAQZynRHmp
+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: 24, y: 23, z: 21, w: 25}
+  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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XXMYti75Vn5RXj+Uhq36Ne2N7QYc/7yXCxgvfqWOUzYab5zkS7An7gUy0Yu8
+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_fbzhongDiban.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DS5J4yz5VXrkzpO5hBT5ZrQkJk+wtq7wooG/pDZrvqD/sno5VP15GYjQLyGN
+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: 35, y: 0, z: 34, 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: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Art/UIAssets/decorate/dec_tiaomulandiban.png.meta

@@ -52,7 +52,7 @@ TextureImporter:
   alignment: 0
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
   spritePixelsToUnits: 100
-  spriteBorder: {x: 45, y: 0, z: 44, w: 0}
+  spriteBorder: {x: 45, y: 35, z: 44, w: 37}
   spriteGenerateFallbackPhysicsShape: 1
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaUsage: 1
   alphaIsTransparency: 1
   alphaIsTransparency: 1

+ 0 - 0
美术/art_use_ui/daoju/icon_fb3402.png → Assets/Art/UIAssets/icon/icon_fb3101.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CikasyqpBXKH6MTW3h/SV7yZ3SCgNJn7h/FhPrHTn3SH7jqHxTTSm/lbqEst
+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_fb3201.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CXodtXn4AH/WdgG2t3Dg699hq+iSH56yx7NE7LSRqoI0xCmBKXvbJLtMHupI
+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_fb3202.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XXMb4X/5Byi1wd/VeIfWUfJKJnIhIAGh0ZNX/agqMyBRweHYNe/ncBBL/fWU
+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: 

+ 0 - 0
美术/art_use_ui/daoju/icon_fb3201.png → Assets/Art/UIAssets/icon/icon_fb3301.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DikWvX/4Bn2Vd3Zgjp3RXQ+ZZBj+IWgHWRHcOAHEryqpvhdyKBPyDZarhStW
+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_fb3401.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CitJ5iulBXLzxnpFZM9ZHZBJhNAj+jQ7TBZvm6CPmRe4BWdNQRQkEgQm9R0n
+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_fb3402.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CnIXsXmkAiruUUkFc5T16Mdyf7KX/rVFaWHhhdLzQzkOg9zlH1ZSVqKXfGg5
+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_fb3501.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CChLsSytWnJB6GKnpco/UPz4EhOfeC+pri4oS0WoFmGrcwiOh5BCyCN/pGtm
+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_skill_3101.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XS9O53v7BS7azCQ0xDh/yXd5zNUckifBuURL+AV5J2feTBcrtcewuPH5ISB+
+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_skill_3201.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Bn0dsHv8Vn0SdGv/xWEVSFvAjgIhXrz7GViTgfQMPlJNDWQae8b52QdAlIfV
+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_skill_3202.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: DC5M4y2tByk00nAskp73NRz8L03d8v78cQUDJUOtn4/CgqElwYdNRDqnf0tr
+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_skill_3301.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: W3pJ5yKkUSr5kMG8l0nt8jNnTk4HZwk+tTkkSYIpu2SS8v33S4lJhpAZzE7L
+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_skill_3401.png


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

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: CXhMti6lVHo40PGSLz0aojs0+n3N/xaR6feFl0Z3+Xm/3q2mW1C97/35QmoP
+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_skill_3501.png


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

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

+ 12 - 1
Assets/Editor/CombatEditor/HeroEntityCombatReport.cs

@@ -25,6 +25,7 @@ namespace xy002Editor.CombatEditor
         private ProgressBarShowModle zhiLiaoModle;
         private ProgressBarShowModle zhiLiaoModle;
         private ProgressBarShowModle beiZhiLiaoModel;
         private ProgressBarShowModle beiZhiLiaoModel;
         private ProgressBarShowModle shouDaoShangHangXingXi;
         private ProgressBarShowModle shouDaoShangHangXingXi;
+        private ProgressBarShowModle gongFaBeiXueRuo;
         private CombatPeportMassgeModle combatPeportMassgeModle;
         private CombatPeportMassgeModle combatPeportMassgeModle;
 
 
         public Foldout miaoShuFoldout;
         public Foldout miaoShuFoldout;
@@ -122,6 +123,16 @@ namespace xy002Editor.CombatEditor
             foldout1.Add(progressVe);
             foldout1.Add(progressVe);
             shouDaoShangHangXingXi = new ProgressBarShowModle(progressVe, combaReportEnditorManager);
             shouDaoShangHangXingXi = new ProgressBarShowModle(progressVe, combaReportEnditorManager);
 
 
+            foldout1 = combaReportEnditorManager.Copy<Foldout>("foldout_style");
+            foldout1.text = "功法被削弱";
+            foldout1.style.unityFontStyleAndWeight = FontStyle.Bold;
+            foldout1.value = false;
+            visualElement_h.Add(foldout1);
+            progressVe = combaReportEnditorManager.Copy<VisualElement>("value_data_style");
+            foldout1.Add(progressVe);
+            gongFaBeiXueRuo = new ProgressBarShowModle(progressVe, combaReportEnditorManager);
+
+            
 
 
             miaoShuFoldout = combaReportEnditorManager.Copy<Foldout>("foldout_style");
             miaoShuFoldout = combaReportEnditorManager.Copy<Foldout>("foldout_style");
             miaoShuFoldout.text = "战斗描述";
             miaoShuFoldout.text = "战斗描述";
@@ -152,7 +163,7 @@ namespace xy002Editor.CombatEditor
                 combatReportEntityInfo.allHarm);
                 combatReportEntityInfo.allHarm);
             DrwaBattleReportValueDataModule(combatReportEntityInfo.InjuredInfoModule, shouDaoShangHangXingXi,
             DrwaBattleReportValueDataModule(combatReportEntityInfo.InjuredInfoModule, shouDaoShangHangXingXi,
                 combatReportEntityInfo.allChengShang);
                 combatReportEntityInfo.allChengShang);
-
+            DrwaBattleReportValueDataModule(combatReportEntityInfo.gongFaBeiXueRuo, gongFaBeiXueRuo);
             if (miaoShuFoldout.value)
             if (miaoShuFoldout.value)
             {
             {
                 combatPeportMassgeModle.OnGui();
                 combatPeportMassgeModle.OnGui();

+ 115 - 19
Assets/Res/Config/EventConfig.json

@@ -2,7 +2,13 @@
   "configList": [
   "configList": [
     {
     {
       "ID": 1,
       "ID": 1,
-      "EventBeginId": 1001,
+      "EventLinksId": [
+        1001,
+        1002,
+        1003,
+        1004,
+        1005
+      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventType": 1,
       "EventType": 1,
       "EventQuality": 1,
       "EventQuality": 1,
@@ -12,11 +18,20 @@
       "EventVlaue": [
       "EventVlaue": [
         0
         0
       ],
       ],
-      "Description": 174
+      "EventName": 174,
+      "Description": null
     },
     },
     {
     {
       "ID": 2,
       "ID": 2,
-      "EventBeginId": 1010,
+      "EventLinksId": [
+        1010,
+        1011,
+        1012,
+        1013,
+        1014,
+        1015,
+        1016
+      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventType": 1,
       "EventType": 1,
       "EventQuality": 1,
       "EventQuality": 1,
@@ -26,11 +41,20 @@
       "EventVlaue": [
       "EventVlaue": [
         0
         0
       ],
       ],
-      "Description": 175
+      "EventName": 175,
+      "Description": null
     },
     },
     {
     {
       "ID": 3,
       "ID": 3,
-      "EventBeginId": 1020,
+      "EventLinksId": [
+        1020,
+        1021,
+        1022,
+        1023,
+        1024,
+        1025,
+        1026
+      ],
       "EventTriggerType": 3,
       "EventTriggerType": 3,
       "EventType": 1,
       "EventType": 1,
       "EventQuality": 1,
       "EventQuality": 1,
@@ -40,11 +64,14 @@
       "EventVlaue": [
       "EventVlaue": [
         0
         0
       ],
       ],
-      "Description": 176
+      "EventName": 176,
+      "Description": null
     },
     },
     {
     {
       "ID": 4,
       "ID": 4,
-      "EventBeginId": 1030,
+      "EventLinksId": [
+        1030
+      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventType": 2,
       "EventType": 2,
       "EventQuality": 1,
       "EventQuality": 1,
@@ -54,11 +81,14 @@
       "EventVlaue": [
       "EventVlaue": [
         0
         0
       ],
       ],
-      "Description": 217
+      "EventName": 217,
+      "Description": null
     },
     },
     {
     {
       "ID": 5,
       "ID": 5,
-      "EventBeginId": 1040,
+      "EventLinksId": [
+        1040
+      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventType": 2,
       "EventType": 2,
       "EventQuality": 1,
       "EventQuality": 1,
@@ -68,11 +98,14 @@
       "EventVlaue": [
       "EventVlaue": [
         0
         0
       ],
       ],
-      "Description": 218
+      "EventName": 218,
+      "Description": null
     },
     },
     {
     {
       "ID": 6,
       "ID": 6,
-      "EventBeginId": 1050,
+      "EventLinksId": [
+        1050
+      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventType": 2,
       "EventType": 2,
       "EventQuality": 1,
       "EventQuality": 1,
@@ -82,11 +115,14 @@
       "EventVlaue": [
       "EventVlaue": [
         0
         0
       ],
       ],
-      "Description": 219
+      "EventName": 219,
+      "Description": null
     },
     },
     {
     {
       "ID": 7,
       "ID": 7,
-      "EventBeginId": 1060,
+      "EventLinksId": [
+        1060
+      ],
       "EventTriggerType": 1,
       "EventTriggerType": 1,
       "EventType": 2,
       "EventType": 2,
       "EventQuality": 1,
       "EventQuality": 1,
@@ -96,47 +132,107 @@
       "EventVlaue": [
       "EventVlaue": [
         0
         0
       ],
       ],
-      "Description": 220
+      "EventName": 220,
+      "Description": null
     },
     },
     {
     {
       "ID": 11,
       "ID": 11,
-      "EventBeginId": 10001,
+      "EventLinksId": [
+        10001
+      ],
       "EventTriggerType": 2,
       "EventTriggerType": 2,
       "EventType": 1,
       "EventType": 1,
       "EventQuality": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
       "Description": null
     },
     },
     {
     {
       "ID": 12,
       "ID": 12,
-      "EventBeginId": 10003,
+      "EventLinksId": [
+        10003
+      ],
       "EventTriggerType": 2,
       "EventTriggerType": 2,
       "EventType": 1,
       "EventType": 1,
       "EventQuality": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
       "Description": null
     },
     },
     {
     {
       "ID": 13,
       "ID": 13,
-      "EventBeginId": 10004,
+      "EventLinksId": [
+        10004
+      ],
       "EventTriggerType": 2,
       "EventTriggerType": 2,
       "EventType": 1,
       "EventType": 1,
       "EventQuality": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
       "Description": null
     },
     },
     {
     {
       "ID": 14,
       "ID": 14,
-      "EventBeginId": 10005,
+      "EventLinksId": [
+        10005
+      ],
       "EventTriggerType": 2,
       "EventTriggerType": 2,
       "EventType": 1,
       "EventType": 1,
       "EventQuality": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
       "Description": null
     },
     },
     {
     {
       "ID": 15,
       "ID": 15,
-      "EventBeginId": 10006,
+      "EventLinksId": [
+        10006
+      ],
       "EventTriggerType": 2,
       "EventTriggerType": 2,
       "EventType": 1,
       "EventType": 1,
       "EventQuality": 1,
       "EventQuality": 1,
+      "EventName": null,
       "Description": null
       "Description": null
+    },
+    {
+      "ID": 10001,
+      "EventLinksId": [
+        100001
+      ],
+      "EventTriggerType": 4,
+      "EventType": 1,
+      "EventQuality": 1,
+      "EventName": 1906,
+      "Description": 1914
+    },
+    {
+      "ID": 10002,
+      "EventLinksId": [
+        100002
+      ],
+      "EventTriggerType": 4,
+      "EventType": 1,
+      "EventQuality": 1,
+      "EventName": 1907,
+      "Description": 1915
+    },
+    {
+      "ID": 10003,
+      "EventLinksId": [
+        100003
+      ],
+      "EventTriggerType": 4,
+      "EventType": 1,
+      "EventQuality": 1,
+      "EventName": 1908,
+      "Description": 1916
+    },
+    {
+      "ID": 10004,
+      "EventLinksId": [
+        100004
+      ],
+      "EventTriggerType": 4,
+      "EventType": 1,
+      "EventQuality": 1,
+      "EventName": 1909,
+      "Description": 1917
     }
     }
   ]
   ]
 }
 }

+ 174 - 22
Assets/Res/Config/EventConditionConfig.json → Assets/Res/Config/EventLinkConfig.json

@@ -2,18 +2,23 @@
   "configList": [
   "configList": [
     {
     {
       "ID": 100,
       "ID": 100,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         216
         216
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
-      "optionType": null
+      "finishCount": null,
+      "optionType": null,
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1001,
       "ID": 1001,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         177
         177
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 1,
       "optionType": 1,
       "optionPara1": [
       "optionPara1": [
         1002,
         1002,
@@ -22,18 +27,25 @@
       "optionPara2": [
       "optionPara2": [
         198,
         198,
         199
         199
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1002,
       "ID": 1002,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         178
         178
       ],
       ],
-      "ConditionType": null,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1001
+      ],
+      "finishCount": 10,
       "optionType": 2,
       "optionType": 2,
       "optionPara1": [
       "optionPara1": [
         100001
         100001
       ],
       ],
+      "ResultType": 2,
       "ResultOptions": [
       "ResultOptions": [
         1004,
         1004,
         100
         100
@@ -41,52 +53,69 @@
     },
     },
     {
     {
       "ID": 1003,
       "ID": 1003,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         179
         179
       ],
       ],
-      "ConditionType": null,
+      "ConditionType": 1,
+      "ConditionPara": [
+        1002
+      ],
+      "finishCount": 10,
       "optionType": 1,
       "optionType": 1,
       "optionPara1": [
       "optionPara1": [
         1005
         1005
       ],
       ],
       "optionPara2": [
       "optionPara2": [
         200
         200
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1004,
       "ID": 1004,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         180
         180
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1002
         1002
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         100
         100
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1005,
       "ID": 1005,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         181
         181
       ],
       ],
-      "ConditionType": null,
+      "ConditionType": 3,
+      "ConditionPara": [
+        10
+      ],
+      "finishCount": 1,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1001
         1001
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         50
         50
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1010,
       "ID": 1010,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         182
         182
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 1,
       "optionType": 1,
       "optionPara1": [
       "optionPara1": [
         1011,
         1011,
@@ -95,14 +124,17 @@
       "optionPara2": [
       "optionPara2": [
         201,
         201,
         202
         202
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1011,
       "ID": 1011,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         183
         183
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 1,
       "optionType": 1,
       "optionPara1": [
       "optionPara1": [
         1014,
         1014,
@@ -111,33 +143,40 @@
       "optionPara2": [
       "optionPara2": [
         203,
         203,
         204
         204
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1012,
       "ID": 1012,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         184,
         184,
         187
         187
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1001
         1001
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         10
         10
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1014,
       "ID": 1014,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         185
         185
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 2,
       "optionType": 2,
       "optionPara1": [
       "optionPara1": [
         100002
         100002
       ],
       ],
+      "ResultType": 2,
       "ResultOptions": [
       "ResultOptions": [
         1016,
         1016,
         100
         100
@@ -145,39 +184,47 @@
     },
     },
     {
     {
       "ID": 1015,
       "ID": 1015,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         186,
         186,
         189
         189
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1003
         1003
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         1000
         1000
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1016,
       "ID": 1016,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         188
         188
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": null,
       "optionType": null,
       "PrizeIDs": [
       "PrizeIDs": [
         1001
         1001
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         200
         200
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1020,
       "ID": 1020,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         190
         190
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 1,
       "optionType": 1,
       "optionPara1": [
       "optionPara1": [
         1021,
         1021,
@@ -186,14 +233,17 @@
       "optionPara2": [
       "optionPara2": [
         201,
         201,
         202
         202
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1021,
       "ID": 1021,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         191
         191
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 2,
       "optionType": 2,
       "optionPara1": [
       "optionPara1": [
         100003
         100003
@@ -204,6 +254,7 @@
       "PrizeNums": [
       "PrizeNums": [
         100
         100
       ],
       ],
+      "ResultType": 2,
       "ResultOptions": [
       "ResultOptions": [
         1026,
         1026,
         100
         100
@@ -211,10 +262,12 @@
     },
     },
     {
     {
       "ID": 1022,
       "ID": 1022,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         192
         192
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1002
         1002
@@ -222,17 +275,20 @@
       "PrizeNums": [
       "PrizeNums": [
         10
         10
       ],
       ],
+      "ResultType": 1,
       "ResultOptions": [
       "ResultOptions": [
         1016
         1016
       ]
       ]
     },
     },
     {
     {
       "ID": 1024,
       "ID": 1024,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         193,
         193,
         196
         196
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 2,
       "optionType": 2,
       "optionPara1": [
       "optionPara1": [
         100004
         100004
@@ -243,6 +299,7 @@
       "PrizeNums": [
       "PrizeNums": [
         100
         100
       ],
       ],
+      "ResultType": 2,
       "ResultOptions": [
       "ResultOptions": [
         1016,
         1016,
         100
         100
@@ -250,11 +307,13 @@
     },
     },
     {
     {
       "ID": 1025,
       "ID": 1025,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         194,
         194,
         197
         197
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1002
         1002
@@ -262,16 +321,19 @@
       "PrizeNums": [
       "PrizeNums": [
         1000
         1000
       ],
       ],
+      "ResultType": 1,
       "ResultOptions": [
       "ResultOptions": [
         1002
         1002
       ]
       ]
     },
     },
     {
     {
       "ID": 1026,
       "ID": 1026,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         207
         207
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 1,
       "optionType": 1,
       "optionPara1": [
       "optionPara1": [
         1024,
         1024,
@@ -280,42 +342,51 @@
       "optionPara2": [
       "optionPara2": [
         205,
         205,
         206
         206
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1030,
       "ID": 1030,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         221
         221
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1002
         1002
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         10
         10
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1040,
       "ID": 1040,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         222
         222
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1002
         1002
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         10
         10
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1050,
       "ID": 1050,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         223
         223
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1002,
         1002,
@@ -324,26 +395,33 @@
       "PrizeNums": [
       "PrizeNums": [
         10,
         10,
         20
         20
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 1060,
       "ID": 1060,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         224
         224
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
-      "optionType": null
+      "finishCount": null,
+      "optionType": null,
+      "ResultType": null
     },
     },
     {
     {
       "ID": 10001,
       "ID": 10001,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         208
         208
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 2,
       "optionType": 2,
       "optionPara1": [
       "optionPara1": [
         100001
         100001
       ],
       ],
+      "ResultType": 2,
       "ResultOptions": [
       "ResultOptions": [
         10002,
         10002,
         100
         100
@@ -351,36 +429,43 @@
     },
     },
     {
     {
       "ID": 10002,
       "ID": 10002,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         209
         209
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1003
         1003
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         3000
         3000
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 10003,
       "ID": 10003,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         210,
         210,
         211,
         211,
         1903
         1903
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1005
         1005
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         500
         500
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 10004,
       "ID": 10004,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         212,
         212,
         213,
         213,
@@ -388,24 +473,29 @@
         215
         215
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 3,
       "optionType": 3,
       "PrizeIDs": [
       "PrizeIDs": [
         1006
         1006
       ],
       ],
       "PrizeNums": [
       "PrizeNums": [
         500
         500
-      ]
+      ],
+      "ResultType": null
     },
     },
     {
     {
       "ID": 10005,
       "ID": 10005,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         1901
         1901
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 2,
       "optionType": 2,
       "optionPara1": [
       "optionPara1": [
         100002
         100002
       ],
       ],
+      "ResultType": 2,
       "ResultOptions": [
       "ResultOptions": [
         10002,
         10002,
         100
         100
@@ -413,18 +503,80 @@
     },
     },
     {
     {
       "ID": 10006,
       "ID": 10006,
+      "conciseEventMessage": null,
       "LanID": [
       "LanID": [
         1902
         1902
       ],
       ],
       "ConditionType": null,
       "ConditionType": null,
+      "finishCount": null,
       "optionType": 2,
       "optionType": 2,
       "optionPara1": [
       "optionPara1": [
         100003
         100003
       ],
       ],
+      "ResultType": 2,
       "ResultOptions": [
       "ResultOptions": [
         10002,
         10002,
         100
         100
       ]
       ]
+    },
+    {
+      "ID": 100001,
+      "conciseEventMessage": 1910,
+      "LanID": [
+        1914
+      ],
+      "ConditionType": null,
+      "finishCount": 1,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10002
+      ]
+    },
+    {
+      "ID": 100002,
+      "conciseEventMessage": 1911,
+      "ConditionType": 5,
+      "ConditionPara": [
+        100001
+      ],
+      "finishCount": 1,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 3,
+      "ResultOptions": [
+        10003
+      ]
+    },
+    {
+      "ID": 100003,
+      "conciseEventMessage": 1912,
+      "ConditionType": 6,
+      "ConditionPara": [
+        1001
+      ],
+      "finishCount": 1,
+      "optionType": 4,
+      "optionPara1": [
+        100004
+      ],
+      "ResultType": 3,
+      "ResultOptions": [
+        10004
+      ]
+    },
+    {
+      "ID": 100004,
+      "conciseEventMessage": 1913,
+      "ConditionType": 3,
+      "ConditionPara": [
+        10
+      ],
+      "finishCount": 1,
+      "optionType": null,
+      "ResultType": null
     }
     }
   ]
   ]
 }
 }

+ 7 - 0
Assets/Res/Config/EventLinkConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CCkXtnuqAn7uP+7lsswfZGMEjKndohYSUJMC472BUWGUU7mfjalLv6KCKwjU
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 56 - 71
Assets/Res/Config/FabaoPowerupConfig.json

@@ -3,7 +3,7 @@
     {
     {
       "ID": 1,
       "ID": 1,
       "Power": 100,
       "Power": 100,
-      "HP": 301.0,
+      "HP": 301.75,
       "DEF": 7.5,
       "DEF": 7.5,
       "ATK": 15.0,
       "ATK": 15.0,
       "NeedLv": 11,
       "NeedLv": 11,
@@ -20,7 +20,7 @@
     {
     {
       "ID": 2,
       "ID": 2,
       "Power": 126,
       "Power": 126,
-      "HP": 378.2,
+      "HP": 387.35,
       "DEF": 9.15,
       "DEF": 9.15,
       "ATK": 18.3,
       "ATK": 18.3,
       "NeedLv": 21,
       "NeedLv": 21,
@@ -37,7 +37,7 @@
     {
     {
       "ID": 3,
       "ID": 3,
       "Power": 159,
       "Power": 159,
-      "HP": 480.0,
+      "HP": 502.5,
       "DEF": 11.25,
       "DEF": 11.25,
       "ATK": 22.5,
       "ATK": 22.5,
       "NeedLv": 31,
       "NeedLv": 31,
@@ -49,15 +49,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "PromotePieceNum": [
-        10
-      ],
       "SkillLevel": 1
       "SkillLevel": 1
     },
     },
     {
     {
       "ID": 4,
       "ID": 4,
       "Power": 200,
       "Power": 200,
-      "HP": 646.8,
+      "HP": 690.9,
       "DEF": 14.7,
       "DEF": 14.7,
       "ATK": 29.4,
       "ATK": 29.4,
       "NeedLv": 41,
       "NeedLv": 41,
@@ -74,7 +71,7 @@
     {
     {
       "ID": 5,
       "ID": 5,
       "Power": 252,
       "Power": 252,
-      "HP": 822.8,
+      "HP": 895.4,
       "DEF": 18.15,
       "DEF": 18.15,
       "ATK": 36.3,
       "ATK": 36.3,
       "NeedLv": 51,
       "NeedLv": 51,
@@ -91,7 +88,7 @@
     {
     {
       "ID": 6,
       "ID": 6,
       "Power": 318,
       "Power": 318,
-      "HP": 1050.0,
+      "HP": 1162.5,
       "DEF": 22.5,
       "DEF": 22.5,
       "ATK": 45.0,
       "ATK": 45.0,
       "NeedLv": 61,
       "NeedLv": 61,
@@ -111,7 +108,7 @@
     {
     {
       "ID": 7,
       "ID": 7,
       "Power": 401,
       "Power": 401,
-      "HP": 1411.2,
+      "HP": 1587.6,
       "DEF": 29.4,
       "DEF": 29.4,
       "ATK": 58.8,
       "ATK": 58.8,
       "NeedLv": 71,
       "NeedLv": 71,
@@ -123,12 +120,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 2
     },
     },
     {
     {
       "ID": 8,
       "ID": 8,
       "Power": 505,
       "Power": 505,
-      "HP": 1798.2,
+      "HP": 2053.35,
       "DEF": 36.45,
       "DEF": 36.45,
       "ATK": 72.9,
       "ATK": 72.9,
       "NeedLv": 81,
       "NeedLv": 81,
@@ -140,12 +137,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 2
     },
     },
     {
     {
       "ID": 9,
       "ID": 9,
       "Power": 636,
       "Power": 636,
-      "HP": 2280.0,
+      "HP": 2640.0,
       "DEF": 45.0,
       "DEF": 45.0,
       "ATK": 90.0,
       "ATK": 90.0,
       "NeedLv": 91,
       "NeedLv": 91,
@@ -157,15 +154,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "PromotePieceNum": [
-        10
-      ],
-      "SkillLevel": 1
+      "SkillLevel": 2
     },
     },
     {
     {
       "ID": 10,
       "ID": 10,
       "Power": 801,
       "Power": 801,
-      "HP": 3065.4,
+      "HP": 3595.95,
       "DEF": 58.95,
       "DEF": 58.95,
       "ATK": 117.9,
       "ATK": 117.9,
       "NeedLv": 101,
       "NeedLv": 101,
@@ -177,12 +171,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 2
     },
     },
     {
     {
       "ID": 11,
       "ID": 11,
       "Power": 1009,
       "Power": 1009,
-      "HP": 3880.0,
+      "HP": 4607.5,
       "DEF": 72.75,
       "DEF": 72.75,
       "ATK": 145.5,
       "ATK": 145.5,
       "NeedLv": 111,
       "NeedLv": 111,
@@ -194,12 +188,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 2
     },
     },
     {
     {
       "ID": 12,
       "ID": 12,
       "Power": 1271,
       "Power": 1271,
-      "HP": 4911.8,
+      "HP": 5900.15,
       "DEF": 89.85,
       "DEF": 89.85,
       "ATK": 179.7,
       "ATK": 179.7,
       "NeedLv": 121,
       "NeedLv": 121,
@@ -214,12 +208,12 @@
       "PromotePieceNum": [
       "PromotePieceNum": [
         10
         10
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 2
     },
     },
     {
     {
       "ID": 13,
       "ID": 13,
       "Power": 1601,
       "Power": 1601,
-      "HP": 6594.0,
+      "HP": 8007.0,
       "DEF": 117.75,
       "DEF": 117.75,
       "ATK": 235.5,
       "ATK": 235.5,
       "NeedLv": 131,
       "NeedLv": 131,
@@ -231,12 +225,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 3
     },
     },
     {
     {
       "ID": 14,
       "ID": 14,
       "Power": 2017,
       "Power": 2017,
-      "HP": 8333.4,
+      "HP": 10222.95,
       "DEF": 145.35,
       "DEF": 145.35,
       "ATK": 290.7,
       "ATK": 290.7,
       "NeedLv": 141,
       "NeedLv": 141,
@@ -248,12 +242,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 3
     },
     },
     {
     {
       "ID": 15,
       "ID": 15,
       "Power": 2541,
       "Power": 2541,
-      "HP": 10524.8,
+      "HP": 13036.4,
       "DEF": 179.4,
       "DEF": 179.4,
       "ATK": 358.8,
       "ATK": 358.8,
       "NeedLv": 151,
       "NeedLv": 151,
@@ -265,15 +259,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "PromotePieceNum": [
-        10
-      ],
-      "SkillLevel": 1
+      "SkillLevel": 3
     },
     },
     {
     {
       "ID": 16,
       "ID": 16,
       "Power": 3202,
       "Power": 3202,
-      "HP": 14112.0,
+      "HP": 17640.0,
       "DEF": 235.2,
       "DEF": 235.2,
       "ATK": 470.4,
       "ATK": 470.4,
       "NeedLv": 161,
       "NeedLv": 161,
@@ -285,12 +276,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 3
     },
     },
     {
     {
       "ID": 17,
       "ID": 17,
       "Power": 4035,
       "Power": 4035,
-      "HP": 17811.2,
+      "HP": 22457.6,
       "DEF": 290.4,
       "DEF": 290.4,
       "ATK": 580.8,
       "ATK": 580.8,
       "NeedLv": 171,
       "NeedLv": 171,
@@ -302,12 +293,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 3
     },
     },
     {
     {
       "ID": 18,
       "ID": 18,
       "Power": 5084,
       "Power": 5084,
-      "HP": 22475.4,
+      "HP": 28572.45,
       "DEF": 358.65,
       "DEF": 358.65,
       "ATK": 717.3,
       "ATK": 717.3,
       "NeedLv": 181,
       "NeedLv": 181,
@@ -322,12 +313,12 @@
       "PromotePieceNum": [
       "PromotePieceNum": [
         10
         10
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 3
     },
     },
     {
     {
       "ID": 19,
       "ID": 19,
       "Power": 6406,
       "Power": 6406,
-      "HP": 30086.4,
+      "HP": 38548.2,
       "DEF": 470.1,
       "DEF": 470.1,
       "ATK": 940.2,
       "ATK": 940.2,
       "NeedLv": 191,
       "NeedLv": 191,
@@ -339,12 +330,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 4
     },
     },
     {
     {
       "ID": 20,
       "ID": 20,
       "Power": 8072,
       "Power": 8072,
-      "HP": 37926.0,
+      "HP": 48955.5,
       "DEF": 580.5,
       "DEF": 580.5,
       "ATK": 1161.0,
       "ATK": 1161.0,
       "NeedLv": 201,
       "NeedLv": 201,
@@ -356,12 +347,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 4
     },
     },
     {
     {
       "ID": 21,
       "ID": 21,
       "Power": 10171,
       "Power": 10171,
-      "HP": 47780.0,
+      "HP": 62114.0,
       "DEF": 716.7,
       "DEF": 716.7,
       "ATK": 1433.4,
       "ATK": 1433.4,
       "NeedLv": 211,
       "NeedLv": 211,
@@ -373,15 +364,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "PromotePieceNum": [
-        10
-      ],
-      "SkillLevel": 1
+      "SkillLevel": 4
     },
     },
     {
     {
       "ID": 22,
       "ID": 22,
       "Power": 12815,
       "Power": 12815,
-      "HP": 63892.8,
+      "HP": 83624.4,
       "DEF": 939.6,
       "DEF": 939.6,
       "ATK": 1879.2,
       "ATK": 1879.2,
       "NeedLv": 221,
       "NeedLv": 221,
@@ -393,12 +381,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 4
     },
     },
     {
     {
       "ID": 23,
       "ID": 23,
       "Power": 16147,
       "Power": 16147,
-      "HP": 80433.6,
+      "HP": 105955.8,
       "DEF": 1160.1,
       "DEF": 1160.1,
       "ATK": 2320.2,
       "ATK": 2320.2,
       "NeedLv": 231,
       "NeedLv": 231,
@@ -410,12 +398,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 4
     },
     },
     {
     {
       "ID": 24,
       "ID": 24,
       "Power": 20345,
       "Power": 20345,
-      "HP": 101219.4,
+      "HP": 134163.453,
       "DEF": 1432.35,
       "DEF": 1432.35,
       "ATK": 2864.7,
       "ATK": 2864.7,
       "NeedLv": 241,
       "NeedLv": 241,
@@ -430,12 +418,12 @@
       "PromotePieceNum": [
       "PromotePieceNum": [
         10
         10
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 4
     },
     },
     {
     {
       "ID": 25,
       "ID": 25,
       "Power": 25635,
       "Power": 25635,
-      "HP": 135194.4,
+      "HP": 180259.2,
       "DEF": 1877.7,
       "DEF": 1877.7,
       "ATK": 3755.4,
       "ATK": 3755.4,
       "NeedLv": 251,
       "NeedLv": 251,
@@ -447,12 +435,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 5
     },
     },
     {
     {
       "ID": 26,
       "ID": 26,
       "Power": 32300,
       "Power": 32300,
-      "HP": 170016.0,
+      "HP": 227976.0,
       "DEF": 2318.4,
       "DEF": 2318.4,
       "ATK": 4636.8,
       "ATK": 4636.8,
       "NeedLv": 261,
       "NeedLv": 261,
@@ -464,12 +452,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 5
     },
     },
     {
     {
       "ID": 27,
       "ID": 27,
       "Power": 40698,
       "Power": 40698,
-      "HP": 213740.8,
+      "HP": 288168.4,
       "DEF": 2862.6,
       "DEF": 2862.6,
       "ATK": 5725.2,
       "ATK": 5725.2,
       "NeedLv": 271,
       "NeedLv": 271,
@@ -481,15 +469,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "PromotePieceNum": [
-        10
-      ],
-      "SkillLevel": 1
+      "SkillLevel": 5
     },
     },
     {
     {
       "ID": 28,
       "ID": 28,
       "Power": 51279,
       "Power": 51279,
-      "HP": 285205.2,
+      "HP": 386528.1,
       "DEF": 3752.7,
       "DEF": 3752.7,
       "ATK": 7505.4,
       "ATK": 7505.4,
       "NeedLv": 281,
       "NeedLv": 281,
@@ -501,12 +486,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 5
     },
     },
     {
     {
       "ID": 29,
       "ID": 29,
       "Power": 64612,
       "Power": 64612,
-      "HP": 358324.0,
+      "HP": 488062.0,
       "DEF": 4633.5,
       "DEF": 4633.5,
       "ATK": 9267.0,
       "ATK": 9267.0,
       "NeedLv": 291,
       "NeedLv": 291,
@@ -518,12 +503,12 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 5
     },
     },
     {
     {
       "ID": 30,
       "ID": 30,
       "Power": 81411,
       "Power": 81411,
-      "HP": 450040.2,
+      "HP": 615944.9,
       "DEF": 5720.85,
       "DEF": 5720.85,
       "ATK": 11441.7,
       "ATK": 11441.7,
       "NeedLv": 300,
       "NeedLv": 300,
@@ -538,12 +523,12 @@
       "PromotePieceNum": [
       "PromotePieceNum": [
         10
         10
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 5
     },
     },
     {
     {
       "ID": 31,
       "ID": 31,
       "Power": 102578,
       "Power": 102578,
-      "HP": 600000.0,
+      "HP": 825000.0,
       "DEF": 7500.0,
       "DEF": 7500.0,
       "ATK": 15000.0,
       "ATK": 15000.0,
       "NeedLv": 310,
       "NeedLv": 310,
@@ -555,7 +540,7 @@
         100,
         100,
         100
         100
       ],
       ],
-      "SkillLevel": 1
+      "SkillLevel": 6
     }
     }
   ]
   ]
 }
 }

+ 4 - 4
Assets/Res/Config/HeroModelConfig.json

@@ -240,10 +240,10 @@
       "model": "Boss01",
       "model": "Boss01",
       "isUseGpu": false,
       "isUseGpu": false,
       "heroType": 4,
       "heroType": 4,
-      "attack": 60,
-      "hp": 312,
-      "def": 60,
-      "shield": 312,
+      "attack": 50,
+      "hp": 150,
+      "def": 50,
+      "shield": 0,
       "speed_atk": 4.0,
       "speed_atk": 4.0,
       "Linggen": [
       "Linggen": [
         100,
         100,

File diff suppressed because it is too large
+ 115 - 115
Assets/Res/Config/HeroPowerUpConfig.json


File diff suppressed because it is too large
+ 246 - 246
Assets/Res/Config/LanguageChineseConfig.json


File diff suppressed because it is too large
+ 224 - 224
Assets/Res/Config/MonsterPowerUpConfig.json


+ 3004 - 0
Assets/Res/Config/ResourceLevelConfig.json

@@ -0,0 +1,3004 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "Level": 1,
+      "value1": 1000.0,
+      "value2": 1000.0,
+      "value3": 1000.0,
+      "value4": 1000.0,
+      "value5": 1000.0,
+      "value6": 1000.0
+    },
+    {
+      "ID": 2,
+      "Level": 2,
+      "value1": 1010.0,
+      "value2": 1010.0,
+      "value3": 1010.0,
+      "value4": 1010.0,
+      "value5": 1010.0,
+      "value6": 1010.0
+    },
+    {
+      "ID": 3,
+      "Level": 3,
+      "value1": 1020.0,
+      "value2": 1020.0,
+      "value3": 1020.0,
+      "value4": 1020.0,
+      "value5": 1020.0,
+      "value6": 1020.0
+    },
+    {
+      "ID": 4,
+      "Level": 4,
+      "value1": 1030.0,
+      "value2": 1030.0,
+      "value3": 1030.0,
+      "value4": 1030.0,
+      "value5": 1030.0,
+      "value6": 1030.0
+    },
+    {
+      "ID": 5,
+      "Level": 5,
+      "value1": 1040.0,
+      "value2": 1040.0,
+      "value3": 1040.0,
+      "value4": 1040.0,
+      "value5": 1040.0,
+      "value6": 1040.0
+    },
+    {
+      "ID": 6,
+      "Level": 6,
+      "value1": 1050.0,
+      "value2": 1050.0,
+      "value3": 1050.0,
+      "value4": 1050.0,
+      "value5": 1050.0,
+      "value6": 1050.0
+    },
+    {
+      "ID": 7,
+      "Level": 7,
+      "value1": 1060.0,
+      "value2": 1060.0,
+      "value3": 1060.0,
+      "value4": 1060.0,
+      "value5": 1060.0,
+      "value6": 1060.0
+    },
+    {
+      "ID": 8,
+      "Level": 8,
+      "value1": 1070.0,
+      "value2": 1070.0,
+      "value3": 1070.0,
+      "value4": 1070.0,
+      "value5": 1070.0,
+      "value6": 1070.0
+    },
+    {
+      "ID": 9,
+      "Level": 9,
+      "value1": 1080.0,
+      "value2": 1080.0,
+      "value3": 1080.0,
+      "value4": 1080.0,
+      "value5": 1080.0,
+      "value6": 1080.0
+    },
+    {
+      "ID": 10,
+      "Level": 10,
+      "value1": 1090.0,
+      "value2": 1090.0,
+      "value3": 1090.0,
+      "value4": 1090.0,
+      "value5": 1090.0,
+      "value6": 1090.0
+    },
+    {
+      "ID": 11,
+      "Level": 11,
+      "value1": 1100.0,
+      "value2": 1100.0,
+      "value3": 1100.0,
+      "value4": 1100.0,
+      "value5": 1100.0,
+      "value6": 1100.0
+    },
+    {
+      "ID": 12,
+      "Level": 12,
+      "value1": 1110.0,
+      "value2": 1110.0,
+      "value3": 1110.0,
+      "value4": 1110.0,
+      "value5": 1110.0,
+      "value6": 1110.0
+    },
+    {
+      "ID": 13,
+      "Level": 13,
+      "value1": 1120.0,
+      "value2": 1120.0,
+      "value3": 1120.0,
+      "value4": 1120.0,
+      "value5": 1120.0,
+      "value6": 1120.0
+    },
+    {
+      "ID": 14,
+      "Level": 14,
+      "value1": 1130.0,
+      "value2": 1130.0,
+      "value3": 1130.0,
+      "value4": 1130.0,
+      "value5": 1130.0,
+      "value6": 1130.0
+    },
+    {
+      "ID": 15,
+      "Level": 15,
+      "value1": 1140.0,
+      "value2": 1140.0,
+      "value3": 1140.0,
+      "value4": 1140.0,
+      "value5": 1140.0,
+      "value6": 1140.0
+    },
+    {
+      "ID": 16,
+      "Level": 16,
+      "value1": 1150.0,
+      "value2": 1150.0,
+      "value3": 1150.0,
+      "value4": 1150.0,
+      "value5": 1150.0,
+      "value6": 1150.0
+    },
+    {
+      "ID": 17,
+      "Level": 17,
+      "value1": 1160.0,
+      "value2": 1160.0,
+      "value3": 1160.0,
+      "value4": 1160.0,
+      "value5": 1160.0,
+      "value6": 1160.0
+    },
+    {
+      "ID": 18,
+      "Level": 18,
+      "value1": 1170.0,
+      "value2": 1170.0,
+      "value3": 1170.0,
+      "value4": 1170.0,
+      "value5": 1170.0,
+      "value6": 1170.0
+    },
+    {
+      "ID": 19,
+      "Level": 19,
+      "value1": 1180.0,
+      "value2": 1180.0,
+      "value3": 1180.0,
+      "value4": 1180.0,
+      "value5": 1180.0,
+      "value6": 1180.0
+    },
+    {
+      "ID": 20,
+      "Level": 20,
+      "value1": 1190.0,
+      "value2": 1190.0,
+      "value3": 1190.0,
+      "value4": 1190.0,
+      "value5": 1190.0,
+      "value6": 1190.0
+    },
+    {
+      "ID": 21,
+      "Level": 21,
+      "value1": 1200.0,
+      "value2": 1200.0,
+      "value3": 1200.0,
+      "value4": 1200.0,
+      "value5": 1200.0,
+      "value6": 1200.0
+    },
+    {
+      "ID": 22,
+      "Level": 22,
+      "value1": 1210.0,
+      "value2": 1210.0,
+      "value3": 1210.0,
+      "value4": 1210.0,
+      "value5": 1210.0,
+      "value6": 1210.0
+    },
+    {
+      "ID": 23,
+      "Level": 23,
+      "value1": 1220.0,
+      "value2": 1220.0,
+      "value3": 1220.0,
+      "value4": 1220.0,
+      "value5": 1220.0,
+      "value6": 1220.0
+    },
+    {
+      "ID": 24,
+      "Level": 24,
+      "value1": 1230.0,
+      "value2": 1230.0,
+      "value3": 1230.0,
+      "value4": 1230.0,
+      "value5": 1230.0,
+      "value6": 1230.0
+    },
+    {
+      "ID": 25,
+      "Level": 25,
+      "value1": 1240.0,
+      "value2": 1240.0,
+      "value3": 1240.0,
+      "value4": 1240.0,
+      "value5": 1240.0,
+      "value6": 1240.0
+    },
+    {
+      "ID": 26,
+      "Level": 26,
+      "value1": 1250.0,
+      "value2": 1250.0,
+      "value3": 1250.0,
+      "value4": 1250.0,
+      "value5": 1250.0,
+      "value6": 1250.0
+    },
+    {
+      "ID": 27,
+      "Level": 27,
+      "value1": 1260.0,
+      "value2": 1260.0,
+      "value3": 1260.0,
+      "value4": 1260.0,
+      "value5": 1260.0,
+      "value6": 1260.0
+    },
+    {
+      "ID": 28,
+      "Level": 28,
+      "value1": 1270.0,
+      "value2": 1270.0,
+      "value3": 1270.0,
+      "value4": 1270.0,
+      "value5": 1270.0,
+      "value6": 1270.0
+    },
+    {
+      "ID": 29,
+      "Level": 29,
+      "value1": 1280.0,
+      "value2": 1280.0,
+      "value3": 1280.0,
+      "value4": 1280.0,
+      "value5": 1280.0,
+      "value6": 1280.0
+    },
+    {
+      "ID": 30,
+      "Level": 30,
+      "value1": 1290.0,
+      "value2": 1290.0,
+      "value3": 1290.0,
+      "value4": 1290.0,
+      "value5": 1290.0,
+      "value6": 1290.0
+    },
+    {
+      "ID": 31,
+      "Level": 31,
+      "value1": 1300.0,
+      "value2": 1300.0,
+      "value3": 1300.0,
+      "value4": 1300.0,
+      "value5": 1300.0,
+      "value6": 1300.0
+    },
+    {
+      "ID": 32,
+      "Level": 32,
+      "value1": 1310.0,
+      "value2": 1310.0,
+      "value3": 1310.0,
+      "value4": 1310.0,
+      "value5": 1310.0,
+      "value6": 1310.0
+    },
+    {
+      "ID": 33,
+      "Level": 33,
+      "value1": 1320.0,
+      "value2": 1320.0,
+      "value3": 1320.0,
+      "value4": 1320.0,
+      "value5": 1320.0,
+      "value6": 1320.0
+    },
+    {
+      "ID": 34,
+      "Level": 34,
+      "value1": 1330.0,
+      "value2": 1330.0,
+      "value3": 1330.0,
+      "value4": 1330.0,
+      "value5": 1330.0,
+      "value6": 1330.0
+    },
+    {
+      "ID": 35,
+      "Level": 35,
+      "value1": 1340.0,
+      "value2": 1340.0,
+      "value3": 1340.0,
+      "value4": 1340.0,
+      "value5": 1340.0,
+      "value6": 1340.0
+    },
+    {
+      "ID": 36,
+      "Level": 36,
+      "value1": 1350.0,
+      "value2": 1350.0,
+      "value3": 1350.0,
+      "value4": 1350.0,
+      "value5": 1350.0,
+      "value6": 1350.0
+    },
+    {
+      "ID": 37,
+      "Level": 37,
+      "value1": 1360.0,
+      "value2": 1360.0,
+      "value3": 1360.0,
+      "value4": 1360.0,
+      "value5": 1360.0,
+      "value6": 1360.0
+    },
+    {
+      "ID": 38,
+      "Level": 38,
+      "value1": 1370.0,
+      "value2": 1370.0,
+      "value3": 1370.0,
+      "value4": 1370.0,
+      "value5": 1370.0,
+      "value6": 1370.0
+    },
+    {
+      "ID": 39,
+      "Level": 39,
+      "value1": 1380.0,
+      "value2": 1380.0,
+      "value3": 1380.0,
+      "value4": 1380.0,
+      "value5": 1380.0,
+      "value6": 1380.0
+    },
+    {
+      "ID": 40,
+      "Level": 40,
+      "value1": 1390.0,
+      "value2": 1390.0,
+      "value3": 1390.0,
+      "value4": 1390.0,
+      "value5": 1390.0,
+      "value6": 1390.0
+    },
+    {
+      "ID": 41,
+      "Level": 41,
+      "value1": 1400.0,
+      "value2": 1400.0,
+      "value3": 1400.0,
+      "value4": 1400.0,
+      "value5": 1400.0,
+      "value6": 1400.0
+    },
+    {
+      "ID": 42,
+      "Level": 42,
+      "value1": 1410.0,
+      "value2": 1410.0,
+      "value3": 1410.0,
+      "value4": 1410.0,
+      "value5": 1410.0,
+      "value6": 1410.0
+    },
+    {
+      "ID": 43,
+      "Level": 43,
+      "value1": 1420.0,
+      "value2": 1420.0,
+      "value3": 1420.0,
+      "value4": 1420.0,
+      "value5": 1420.0,
+      "value6": 1420.0
+    },
+    {
+      "ID": 44,
+      "Level": 44,
+      "value1": 1430.0,
+      "value2": 1430.0,
+      "value3": 1430.0,
+      "value4": 1430.0,
+      "value5": 1430.0,
+      "value6": 1430.0
+    },
+    {
+      "ID": 45,
+      "Level": 45,
+      "value1": 1440.0,
+      "value2": 1440.0,
+      "value3": 1440.0,
+      "value4": 1440.0,
+      "value5": 1440.0,
+      "value6": 1440.0
+    },
+    {
+      "ID": 46,
+      "Level": 46,
+      "value1": 1450.0,
+      "value2": 1450.0,
+      "value3": 1450.0,
+      "value4": 1450.0,
+      "value5": 1450.0,
+      "value6": 1450.0
+    },
+    {
+      "ID": 47,
+      "Level": 47,
+      "value1": 1460.0,
+      "value2": 1460.0,
+      "value3": 1460.0,
+      "value4": 1460.0,
+      "value5": 1460.0,
+      "value6": 1460.0
+    },
+    {
+      "ID": 48,
+      "Level": 48,
+      "value1": 1470.0,
+      "value2": 1470.0,
+      "value3": 1470.0,
+      "value4": 1470.0,
+      "value5": 1470.0,
+      "value6": 1470.0
+    },
+    {
+      "ID": 49,
+      "Level": 49,
+      "value1": 1480.0,
+      "value2": 1480.0,
+      "value3": 1480.0,
+      "value4": 1480.0,
+      "value5": 1480.0,
+      "value6": 1480.0
+    },
+    {
+      "ID": 50,
+      "Level": 50,
+      "value1": 1490.0,
+      "value2": 1490.0,
+      "value3": 1490.0,
+      "value4": 1490.0,
+      "value5": 1490.0,
+      "value6": 1490.0
+    },
+    {
+      "ID": 51,
+      "Level": 51,
+      "value1": 1500.0,
+      "value2": 1500.0,
+      "value3": 1500.0,
+      "value4": 1500.0,
+      "value5": 1500.0,
+      "value6": 1500.0
+    },
+    {
+      "ID": 52,
+      "Level": 52,
+      "value1": 1510.0,
+      "value2": 1510.0,
+      "value3": 1510.0,
+      "value4": 1510.0,
+      "value5": 1510.0,
+      "value6": 1510.0
+    },
+    {
+      "ID": 53,
+      "Level": 53,
+      "value1": 1520.0,
+      "value2": 1520.0,
+      "value3": 1520.0,
+      "value4": 1520.0,
+      "value5": 1520.0,
+      "value6": 1520.0
+    },
+    {
+      "ID": 54,
+      "Level": 54,
+      "value1": 1530.0,
+      "value2": 1530.0,
+      "value3": 1530.0,
+      "value4": 1530.0,
+      "value5": 1530.0,
+      "value6": 1530.0
+    },
+    {
+      "ID": 55,
+      "Level": 55,
+      "value1": 1540.0,
+      "value2": 1540.0,
+      "value3": 1540.0,
+      "value4": 1540.0,
+      "value5": 1540.0,
+      "value6": 1540.0
+    },
+    {
+      "ID": 56,
+      "Level": 56,
+      "value1": 1550.0,
+      "value2": 1550.0,
+      "value3": 1550.0,
+      "value4": 1550.0,
+      "value5": 1550.0,
+      "value6": 1550.0
+    },
+    {
+      "ID": 57,
+      "Level": 57,
+      "value1": 1560.0,
+      "value2": 1560.0,
+      "value3": 1560.0,
+      "value4": 1560.0,
+      "value5": 1560.0,
+      "value6": 1560.0
+    },
+    {
+      "ID": 58,
+      "Level": 58,
+      "value1": 1570.0,
+      "value2": 1570.0,
+      "value3": 1570.0,
+      "value4": 1570.0,
+      "value5": 1570.0,
+      "value6": 1570.0
+    },
+    {
+      "ID": 59,
+      "Level": 59,
+      "value1": 1580.0,
+      "value2": 1580.0,
+      "value3": 1580.0,
+      "value4": 1580.0,
+      "value5": 1580.0,
+      "value6": 1580.0
+    },
+    {
+      "ID": 60,
+      "Level": 60,
+      "value1": 1590.0,
+      "value2": 1590.0,
+      "value3": 1590.0,
+      "value4": 1590.0,
+      "value5": 1590.0,
+      "value6": 1590.0
+    },
+    {
+      "ID": 61,
+      "Level": 61,
+      "value1": 1600.0,
+      "value2": 1600.0,
+      "value3": 1600.0,
+      "value4": 1600.0,
+      "value5": 1600.0,
+      "value6": 1600.0
+    },
+    {
+      "ID": 62,
+      "Level": 62,
+      "value1": 1610.0,
+      "value2": 1610.0,
+      "value3": 1610.0,
+      "value4": 1610.0,
+      "value5": 1610.0,
+      "value6": 1610.0
+    },
+    {
+      "ID": 63,
+      "Level": 63,
+      "value1": 1620.0,
+      "value2": 1620.0,
+      "value3": 1620.0,
+      "value4": 1620.0,
+      "value5": 1620.0,
+      "value6": 1620.0
+    },
+    {
+      "ID": 64,
+      "Level": 64,
+      "value1": 1630.0,
+      "value2": 1630.0,
+      "value3": 1630.0,
+      "value4": 1630.0,
+      "value5": 1630.0,
+      "value6": 1630.0
+    },
+    {
+      "ID": 65,
+      "Level": 65,
+      "value1": 1640.0,
+      "value2": 1640.0,
+      "value3": 1640.0,
+      "value4": 1640.0,
+      "value5": 1640.0,
+      "value6": 1640.0
+    },
+    {
+      "ID": 66,
+      "Level": 66,
+      "value1": 1650.0,
+      "value2": 1650.0,
+      "value3": 1650.0,
+      "value4": 1650.0,
+      "value5": 1650.0,
+      "value6": 1650.0
+    },
+    {
+      "ID": 67,
+      "Level": 67,
+      "value1": 1660.0,
+      "value2": 1660.0,
+      "value3": 1660.0,
+      "value4": 1660.0,
+      "value5": 1660.0,
+      "value6": 1660.0
+    },
+    {
+      "ID": 68,
+      "Level": 68,
+      "value1": 1670.0,
+      "value2": 1670.0,
+      "value3": 1670.0,
+      "value4": 1670.0,
+      "value5": 1670.0,
+      "value6": 1670.0
+    },
+    {
+      "ID": 69,
+      "Level": 69,
+      "value1": 1680.0,
+      "value2": 1680.0,
+      "value3": 1680.0,
+      "value4": 1680.0,
+      "value5": 1680.0,
+      "value6": 1680.0
+    },
+    {
+      "ID": 70,
+      "Level": 70,
+      "value1": 1690.0,
+      "value2": 1690.0,
+      "value3": 1690.0,
+      "value4": 1690.0,
+      "value5": 1690.0,
+      "value6": 1690.0
+    },
+    {
+      "ID": 71,
+      "Level": 71,
+      "value1": 1700.0,
+      "value2": 1700.0,
+      "value3": 1700.0,
+      "value4": 1700.0,
+      "value5": 1700.0,
+      "value6": 1700.0
+    },
+    {
+      "ID": 72,
+      "Level": 72,
+      "value1": 1710.0,
+      "value2": 1710.0,
+      "value3": 1710.0,
+      "value4": 1710.0,
+      "value5": 1710.0,
+      "value6": 1710.0
+    },
+    {
+      "ID": 73,
+      "Level": 73,
+      "value1": 1720.0,
+      "value2": 1720.0,
+      "value3": 1720.0,
+      "value4": 1720.0,
+      "value5": 1720.0,
+      "value6": 1720.0
+    },
+    {
+      "ID": 74,
+      "Level": 74,
+      "value1": 1730.0,
+      "value2": 1730.0,
+      "value3": 1730.0,
+      "value4": 1730.0,
+      "value5": 1730.0,
+      "value6": 1730.0
+    },
+    {
+      "ID": 75,
+      "Level": 75,
+      "value1": 1740.0,
+      "value2": 1740.0,
+      "value3": 1740.0,
+      "value4": 1740.0,
+      "value5": 1740.0,
+      "value6": 1740.0
+    },
+    {
+      "ID": 76,
+      "Level": 76,
+      "value1": 1750.0,
+      "value2": 1750.0,
+      "value3": 1750.0,
+      "value4": 1750.0,
+      "value5": 1750.0,
+      "value6": 1750.0
+    },
+    {
+      "ID": 77,
+      "Level": 77,
+      "value1": 1760.0,
+      "value2": 1760.0,
+      "value3": 1760.0,
+      "value4": 1760.0,
+      "value5": 1760.0,
+      "value6": 1760.0
+    },
+    {
+      "ID": 78,
+      "Level": 78,
+      "value1": 1770.0,
+      "value2": 1770.0,
+      "value3": 1770.0,
+      "value4": 1770.0,
+      "value5": 1770.0,
+      "value6": 1770.0
+    },
+    {
+      "ID": 79,
+      "Level": 79,
+      "value1": 1780.0,
+      "value2": 1780.0,
+      "value3": 1780.0,
+      "value4": 1780.0,
+      "value5": 1780.0,
+      "value6": 1780.0
+    },
+    {
+      "ID": 80,
+      "Level": 80,
+      "value1": 1790.0,
+      "value2": 1790.0,
+      "value3": 1790.0,
+      "value4": 1790.0,
+      "value5": 1790.0,
+      "value6": 1790.0
+    },
+    {
+      "ID": 81,
+      "Level": 81,
+      "value1": 1800.0,
+      "value2": 1800.0,
+      "value3": 1800.0,
+      "value4": 1800.0,
+      "value5": 1800.0,
+      "value6": 1800.0
+    },
+    {
+      "ID": 82,
+      "Level": 82,
+      "value1": 1810.0,
+      "value2": 1810.0,
+      "value3": 1810.0,
+      "value4": 1810.0,
+      "value5": 1810.0,
+      "value6": 1810.0
+    },
+    {
+      "ID": 83,
+      "Level": 83,
+      "value1": 1820.0,
+      "value2": 1820.0,
+      "value3": 1820.0,
+      "value4": 1820.0,
+      "value5": 1820.0,
+      "value6": 1820.0
+    },
+    {
+      "ID": 84,
+      "Level": 84,
+      "value1": 1830.0,
+      "value2": 1830.0,
+      "value3": 1830.0,
+      "value4": 1830.0,
+      "value5": 1830.0,
+      "value6": 1830.0
+    },
+    {
+      "ID": 85,
+      "Level": 85,
+      "value1": 1840.0,
+      "value2": 1840.0,
+      "value3": 1840.0,
+      "value4": 1840.0,
+      "value5": 1840.0,
+      "value6": 1840.0
+    },
+    {
+      "ID": 86,
+      "Level": 86,
+      "value1": 1850.0,
+      "value2": 1850.0,
+      "value3": 1850.0,
+      "value4": 1850.0,
+      "value5": 1850.0,
+      "value6": 1850.0
+    },
+    {
+      "ID": 87,
+      "Level": 87,
+      "value1": 1860.0,
+      "value2": 1860.0,
+      "value3": 1860.0,
+      "value4": 1860.0,
+      "value5": 1860.0,
+      "value6": 1860.0
+    },
+    {
+      "ID": 88,
+      "Level": 88,
+      "value1": 1870.0,
+      "value2": 1870.0,
+      "value3": 1870.0,
+      "value4": 1870.0,
+      "value5": 1870.0,
+      "value6": 1870.0
+    },
+    {
+      "ID": 89,
+      "Level": 89,
+      "value1": 1880.0,
+      "value2": 1880.0,
+      "value3": 1880.0,
+      "value4": 1880.0,
+      "value5": 1880.0,
+      "value6": 1880.0
+    },
+    {
+      "ID": 90,
+      "Level": 90,
+      "value1": 1890.0,
+      "value2": 1890.0,
+      "value3": 1890.0,
+      "value4": 1890.0,
+      "value5": 1890.0,
+      "value6": 1890.0
+    },
+    {
+      "ID": 91,
+      "Level": 91,
+      "value1": 1900.0,
+      "value2": 1900.0,
+      "value3": 1900.0,
+      "value4": 1900.0,
+      "value5": 1900.0,
+      "value6": 1900.0
+    },
+    {
+      "ID": 92,
+      "Level": 92,
+      "value1": 1910.0,
+      "value2": 1910.0,
+      "value3": 1910.0,
+      "value4": 1910.0,
+      "value5": 1910.0,
+      "value6": 1910.0
+    },
+    {
+      "ID": 93,
+      "Level": 93,
+      "value1": 1920.0,
+      "value2": 1920.0,
+      "value3": 1920.0,
+      "value4": 1920.0,
+      "value5": 1920.0,
+      "value6": 1920.0
+    },
+    {
+      "ID": 94,
+      "Level": 94,
+      "value1": 1930.0,
+      "value2": 1930.0,
+      "value3": 1930.0,
+      "value4": 1930.0,
+      "value5": 1930.0,
+      "value6": 1930.0
+    },
+    {
+      "ID": 95,
+      "Level": 95,
+      "value1": 1940.0,
+      "value2": 1940.0,
+      "value3": 1940.0,
+      "value4": 1940.0,
+      "value5": 1940.0,
+      "value6": 1940.0
+    },
+    {
+      "ID": 96,
+      "Level": 96,
+      "value1": 1950.0,
+      "value2": 1950.0,
+      "value3": 1950.0,
+      "value4": 1950.0,
+      "value5": 1950.0,
+      "value6": 1950.0
+    },
+    {
+      "ID": 97,
+      "Level": 97,
+      "value1": 1960.0,
+      "value2": 1960.0,
+      "value3": 1960.0,
+      "value4": 1960.0,
+      "value5": 1960.0,
+      "value6": 1960.0
+    },
+    {
+      "ID": 98,
+      "Level": 98,
+      "value1": 1970.0,
+      "value2": 1970.0,
+      "value3": 1970.0,
+      "value4": 1970.0,
+      "value5": 1970.0,
+      "value6": 1970.0
+    },
+    {
+      "ID": 99,
+      "Level": 99,
+      "value1": 1980.0,
+      "value2": 1980.0,
+      "value3": 1980.0,
+      "value4": 1980.0,
+      "value5": 1980.0,
+      "value6": 1980.0
+    },
+    {
+      "ID": 100,
+      "Level": 100,
+      "value1": 1990.0,
+      "value2": 1990.0,
+      "value3": 1990.0,
+      "value4": 1990.0,
+      "value5": 1990.0,
+      "value6": 1990.0
+    },
+    {
+      "ID": 101,
+      "Level": 101,
+      "value1": 2000.0,
+      "value2": 2000.0,
+      "value3": 2000.0,
+      "value4": 2000.0,
+      "value5": 2000.0,
+      "value6": 2000.0
+    },
+    {
+      "ID": 102,
+      "Level": 102,
+      "value1": 2010.0,
+      "value2": 2010.0,
+      "value3": 2010.0,
+      "value4": 2010.0,
+      "value5": 2010.0,
+      "value6": 2010.0
+    },
+    {
+      "ID": 103,
+      "Level": 103,
+      "value1": 2020.0,
+      "value2": 2020.0,
+      "value3": 2020.0,
+      "value4": 2020.0,
+      "value5": 2020.0,
+      "value6": 2020.0
+    },
+    {
+      "ID": 104,
+      "Level": 104,
+      "value1": 2030.0,
+      "value2": 2030.0,
+      "value3": 2030.0,
+      "value4": 2030.0,
+      "value5": 2030.0,
+      "value6": 2030.0
+    },
+    {
+      "ID": 105,
+      "Level": 105,
+      "value1": 2040.0,
+      "value2": 2040.0,
+      "value3": 2040.0,
+      "value4": 2040.0,
+      "value5": 2040.0,
+      "value6": 2040.0
+    },
+    {
+      "ID": 106,
+      "Level": 106,
+      "value1": 2050.0,
+      "value2": 2050.0,
+      "value3": 2050.0,
+      "value4": 2050.0,
+      "value5": 2050.0,
+      "value6": 2050.0
+    },
+    {
+      "ID": 107,
+      "Level": 107,
+      "value1": 2060.0,
+      "value2": 2060.0,
+      "value3": 2060.0,
+      "value4": 2060.0,
+      "value5": 2060.0,
+      "value6": 2060.0
+    },
+    {
+      "ID": 108,
+      "Level": 108,
+      "value1": 2070.0,
+      "value2": 2070.0,
+      "value3": 2070.0,
+      "value4": 2070.0,
+      "value5": 2070.0,
+      "value6": 2070.0
+    },
+    {
+      "ID": 109,
+      "Level": 109,
+      "value1": 2080.0,
+      "value2": 2080.0,
+      "value3": 2080.0,
+      "value4": 2080.0,
+      "value5": 2080.0,
+      "value6": 2080.0
+    },
+    {
+      "ID": 110,
+      "Level": 110,
+      "value1": 2090.0,
+      "value2": 2090.0,
+      "value3": 2090.0,
+      "value4": 2090.0,
+      "value5": 2090.0,
+      "value6": 2090.0
+    },
+    {
+      "ID": 111,
+      "Level": 111,
+      "value1": 2100.0,
+      "value2": 2100.0,
+      "value3": 2100.0,
+      "value4": 2100.0,
+      "value5": 2100.0,
+      "value6": 2100.0
+    },
+    {
+      "ID": 112,
+      "Level": 112,
+      "value1": 2110.0,
+      "value2": 2110.0,
+      "value3": 2110.0,
+      "value4": 2110.0,
+      "value5": 2110.0,
+      "value6": 2110.0
+    },
+    {
+      "ID": 113,
+      "Level": 113,
+      "value1": 2120.0,
+      "value2": 2120.0,
+      "value3": 2120.0,
+      "value4": 2120.0,
+      "value5": 2120.0,
+      "value6": 2120.0
+    },
+    {
+      "ID": 114,
+      "Level": 114,
+      "value1": 2130.0,
+      "value2": 2130.0,
+      "value3": 2130.0,
+      "value4": 2130.0,
+      "value5": 2130.0,
+      "value6": 2130.0
+    },
+    {
+      "ID": 115,
+      "Level": 115,
+      "value1": 2140.0,
+      "value2": 2140.0,
+      "value3": 2140.0,
+      "value4": 2140.0,
+      "value5": 2140.0,
+      "value6": 2140.0
+    },
+    {
+      "ID": 116,
+      "Level": 116,
+      "value1": 2150.0,
+      "value2": 2150.0,
+      "value3": 2150.0,
+      "value4": 2150.0,
+      "value5": 2150.0,
+      "value6": 2150.0
+    },
+    {
+      "ID": 117,
+      "Level": 117,
+      "value1": 2160.0,
+      "value2": 2160.0,
+      "value3": 2160.0,
+      "value4": 2160.0,
+      "value5": 2160.0,
+      "value6": 2160.0
+    },
+    {
+      "ID": 118,
+      "Level": 118,
+      "value1": 2170.0,
+      "value2": 2170.0,
+      "value3": 2170.0,
+      "value4": 2170.0,
+      "value5": 2170.0,
+      "value6": 2170.0
+    },
+    {
+      "ID": 119,
+      "Level": 119,
+      "value1": 2180.0,
+      "value2": 2180.0,
+      "value3": 2180.0,
+      "value4": 2180.0,
+      "value5": 2180.0,
+      "value6": 2180.0
+    },
+    {
+      "ID": 120,
+      "Level": 120,
+      "value1": 2190.0,
+      "value2": 2190.0,
+      "value3": 2190.0,
+      "value4": 2190.0,
+      "value5": 2190.0,
+      "value6": 2190.0
+    },
+    {
+      "ID": 121,
+      "Level": 121,
+      "value1": 2200.0,
+      "value2": 2200.0,
+      "value3": 2200.0,
+      "value4": 2200.0,
+      "value5": 2200.0,
+      "value6": 2200.0
+    },
+    {
+      "ID": 122,
+      "Level": 122,
+      "value1": 2210.0,
+      "value2": 2210.0,
+      "value3": 2210.0,
+      "value4": 2210.0,
+      "value5": 2210.0,
+      "value6": 2210.0
+    },
+    {
+      "ID": 123,
+      "Level": 123,
+      "value1": 2220.0,
+      "value2": 2220.0,
+      "value3": 2220.0,
+      "value4": 2220.0,
+      "value5": 2220.0,
+      "value6": 2220.0
+    },
+    {
+      "ID": 124,
+      "Level": 124,
+      "value1": 2230.0,
+      "value2": 2230.0,
+      "value3": 2230.0,
+      "value4": 2230.0,
+      "value5": 2230.0,
+      "value6": 2230.0
+    },
+    {
+      "ID": 125,
+      "Level": 125,
+      "value1": 2240.0,
+      "value2": 2240.0,
+      "value3": 2240.0,
+      "value4": 2240.0,
+      "value5": 2240.0,
+      "value6": 2240.0
+    },
+    {
+      "ID": 126,
+      "Level": 126,
+      "value1": 2250.0,
+      "value2": 2250.0,
+      "value3": 2250.0,
+      "value4": 2250.0,
+      "value5": 2250.0,
+      "value6": 2250.0
+    },
+    {
+      "ID": 127,
+      "Level": 127,
+      "value1": 2260.0,
+      "value2": 2260.0,
+      "value3": 2260.0,
+      "value4": 2260.0,
+      "value5": 2260.0,
+      "value6": 2260.0
+    },
+    {
+      "ID": 128,
+      "Level": 128,
+      "value1": 2270.0,
+      "value2": 2270.0,
+      "value3": 2270.0,
+      "value4": 2270.0,
+      "value5": 2270.0,
+      "value6": 2270.0
+    },
+    {
+      "ID": 129,
+      "Level": 129,
+      "value1": 2280.0,
+      "value2": 2280.0,
+      "value3": 2280.0,
+      "value4": 2280.0,
+      "value5": 2280.0,
+      "value6": 2280.0
+    },
+    {
+      "ID": 130,
+      "Level": 130,
+      "value1": 2290.0,
+      "value2": 2290.0,
+      "value3": 2290.0,
+      "value4": 2290.0,
+      "value5": 2290.0,
+      "value6": 2290.0
+    },
+    {
+      "ID": 131,
+      "Level": 131,
+      "value1": 2300.0,
+      "value2": 2300.0,
+      "value3": 2300.0,
+      "value4": 2300.0,
+      "value5": 2300.0,
+      "value6": 2300.0
+    },
+    {
+      "ID": 132,
+      "Level": 132,
+      "value1": 2310.0,
+      "value2": 2310.0,
+      "value3": 2310.0,
+      "value4": 2310.0,
+      "value5": 2310.0,
+      "value6": 2310.0
+    },
+    {
+      "ID": 133,
+      "Level": 133,
+      "value1": 2320.0,
+      "value2": 2320.0,
+      "value3": 2320.0,
+      "value4": 2320.0,
+      "value5": 2320.0,
+      "value6": 2320.0
+    },
+    {
+      "ID": 134,
+      "Level": 134,
+      "value1": 2330.0,
+      "value2": 2330.0,
+      "value3": 2330.0,
+      "value4": 2330.0,
+      "value5": 2330.0,
+      "value6": 2330.0
+    },
+    {
+      "ID": 135,
+      "Level": 135,
+      "value1": 2340.0,
+      "value2": 2340.0,
+      "value3": 2340.0,
+      "value4": 2340.0,
+      "value5": 2340.0,
+      "value6": 2340.0
+    },
+    {
+      "ID": 136,
+      "Level": 136,
+      "value1": 2350.0,
+      "value2": 2350.0,
+      "value3": 2350.0,
+      "value4": 2350.0,
+      "value5": 2350.0,
+      "value6": 2350.0
+    },
+    {
+      "ID": 137,
+      "Level": 137,
+      "value1": 2360.0,
+      "value2": 2360.0,
+      "value3": 2360.0,
+      "value4": 2360.0,
+      "value5": 2360.0,
+      "value6": 2360.0
+    },
+    {
+      "ID": 138,
+      "Level": 138,
+      "value1": 2370.0,
+      "value2": 2370.0,
+      "value3": 2370.0,
+      "value4": 2370.0,
+      "value5": 2370.0,
+      "value6": 2370.0
+    },
+    {
+      "ID": 139,
+      "Level": 139,
+      "value1": 2380.0,
+      "value2": 2380.0,
+      "value3": 2380.0,
+      "value4": 2380.0,
+      "value5": 2380.0,
+      "value6": 2380.0
+    },
+    {
+      "ID": 140,
+      "Level": 140,
+      "value1": 2390.0,
+      "value2": 2390.0,
+      "value3": 2390.0,
+      "value4": 2390.0,
+      "value5": 2390.0,
+      "value6": 2390.0
+    },
+    {
+      "ID": 141,
+      "Level": 141,
+      "value1": 2400.0,
+      "value2": 2400.0,
+      "value3": 2400.0,
+      "value4": 2400.0,
+      "value5": 2400.0,
+      "value6": 2400.0
+    },
+    {
+      "ID": 142,
+      "Level": 142,
+      "value1": 2410.0,
+      "value2": 2410.0,
+      "value3": 2410.0,
+      "value4": 2410.0,
+      "value5": 2410.0,
+      "value6": 2410.0
+    },
+    {
+      "ID": 143,
+      "Level": 143,
+      "value1": 2420.0,
+      "value2": 2420.0,
+      "value3": 2420.0,
+      "value4": 2420.0,
+      "value5": 2420.0,
+      "value6": 2420.0
+    },
+    {
+      "ID": 144,
+      "Level": 144,
+      "value1": 2430.0,
+      "value2": 2430.0,
+      "value3": 2430.0,
+      "value4": 2430.0,
+      "value5": 2430.0,
+      "value6": 2430.0
+    },
+    {
+      "ID": 145,
+      "Level": 145,
+      "value1": 2440.0,
+      "value2": 2440.0,
+      "value3": 2440.0,
+      "value4": 2440.0,
+      "value5": 2440.0,
+      "value6": 2440.0
+    },
+    {
+      "ID": 146,
+      "Level": 146,
+      "value1": 2450.0,
+      "value2": 2450.0,
+      "value3": 2450.0,
+      "value4": 2450.0,
+      "value5": 2450.0,
+      "value6": 2450.0
+    },
+    {
+      "ID": 147,
+      "Level": 147,
+      "value1": 2460.0,
+      "value2": 2460.0,
+      "value3": 2460.0,
+      "value4": 2460.0,
+      "value5": 2460.0,
+      "value6": 2460.0
+    },
+    {
+      "ID": 148,
+      "Level": 148,
+      "value1": 2470.0,
+      "value2": 2470.0,
+      "value3": 2470.0,
+      "value4": 2470.0,
+      "value5": 2470.0,
+      "value6": 2470.0
+    },
+    {
+      "ID": 149,
+      "Level": 149,
+      "value1": 2480.0,
+      "value2": 2480.0,
+      "value3": 2480.0,
+      "value4": 2480.0,
+      "value5": 2480.0,
+      "value6": 2480.0
+    },
+    {
+      "ID": 150,
+      "Level": 150,
+      "value1": 2490.0,
+      "value2": 2490.0,
+      "value3": 2490.0,
+      "value4": 2490.0,
+      "value5": 2490.0,
+      "value6": 2490.0
+    },
+    {
+      "ID": 151,
+      "Level": 151,
+      "value1": 2500.0,
+      "value2": 2500.0,
+      "value3": 2500.0,
+      "value4": 2500.0,
+      "value5": 2500.0,
+      "value6": 2500.0
+    },
+    {
+      "ID": 152,
+      "Level": 152,
+      "value1": 2510.0,
+      "value2": 2510.0,
+      "value3": 2510.0,
+      "value4": 2510.0,
+      "value5": 2510.0,
+      "value6": 2510.0
+    },
+    {
+      "ID": 153,
+      "Level": 153,
+      "value1": 2520.0,
+      "value2": 2520.0,
+      "value3": 2520.0,
+      "value4": 2520.0,
+      "value5": 2520.0,
+      "value6": 2520.0
+    },
+    {
+      "ID": 154,
+      "Level": 154,
+      "value1": 2530.0,
+      "value2": 2530.0,
+      "value3": 2530.0,
+      "value4": 2530.0,
+      "value5": 2530.0,
+      "value6": 2530.0
+    },
+    {
+      "ID": 155,
+      "Level": 155,
+      "value1": 2540.0,
+      "value2": 2540.0,
+      "value3": 2540.0,
+      "value4": 2540.0,
+      "value5": 2540.0,
+      "value6": 2540.0
+    },
+    {
+      "ID": 156,
+      "Level": 156,
+      "value1": 2550.0,
+      "value2": 2550.0,
+      "value3": 2550.0,
+      "value4": 2550.0,
+      "value5": 2550.0,
+      "value6": 2550.0
+    },
+    {
+      "ID": 157,
+      "Level": 157,
+      "value1": 2560.0,
+      "value2": 2560.0,
+      "value3": 2560.0,
+      "value4": 2560.0,
+      "value5": 2560.0,
+      "value6": 2560.0
+    },
+    {
+      "ID": 158,
+      "Level": 158,
+      "value1": 2570.0,
+      "value2": 2570.0,
+      "value3": 2570.0,
+      "value4": 2570.0,
+      "value5": 2570.0,
+      "value6": 2570.0
+    },
+    {
+      "ID": 159,
+      "Level": 159,
+      "value1": 2580.0,
+      "value2": 2580.0,
+      "value3": 2580.0,
+      "value4": 2580.0,
+      "value5": 2580.0,
+      "value6": 2580.0
+    },
+    {
+      "ID": 160,
+      "Level": 160,
+      "value1": 2590.0,
+      "value2": 2590.0,
+      "value3": 2590.0,
+      "value4": 2590.0,
+      "value5": 2590.0,
+      "value6": 2590.0
+    },
+    {
+      "ID": 161,
+      "Level": 161,
+      "value1": 2600.0,
+      "value2": 2600.0,
+      "value3": 2600.0,
+      "value4": 2600.0,
+      "value5": 2600.0,
+      "value6": 2600.0
+    },
+    {
+      "ID": 162,
+      "Level": 162,
+      "value1": 2610.0,
+      "value2": 2610.0,
+      "value3": 2610.0,
+      "value4": 2610.0,
+      "value5": 2610.0,
+      "value6": 2610.0
+    },
+    {
+      "ID": 163,
+      "Level": 163,
+      "value1": 2620.0,
+      "value2": 2620.0,
+      "value3": 2620.0,
+      "value4": 2620.0,
+      "value5": 2620.0,
+      "value6": 2620.0
+    },
+    {
+      "ID": 164,
+      "Level": 164,
+      "value1": 2630.0,
+      "value2": 2630.0,
+      "value3": 2630.0,
+      "value4": 2630.0,
+      "value5": 2630.0,
+      "value6": 2630.0
+    },
+    {
+      "ID": 165,
+      "Level": 165,
+      "value1": 2640.0,
+      "value2": 2640.0,
+      "value3": 2640.0,
+      "value4": 2640.0,
+      "value5": 2640.0,
+      "value6": 2640.0
+    },
+    {
+      "ID": 166,
+      "Level": 166,
+      "value1": 2650.0,
+      "value2": 2650.0,
+      "value3": 2650.0,
+      "value4": 2650.0,
+      "value5": 2650.0,
+      "value6": 2650.0
+    },
+    {
+      "ID": 167,
+      "Level": 167,
+      "value1": 2660.0,
+      "value2": 2660.0,
+      "value3": 2660.0,
+      "value4": 2660.0,
+      "value5": 2660.0,
+      "value6": 2660.0
+    },
+    {
+      "ID": 168,
+      "Level": 168,
+      "value1": 2670.0,
+      "value2": 2670.0,
+      "value3": 2670.0,
+      "value4": 2670.0,
+      "value5": 2670.0,
+      "value6": 2670.0
+    },
+    {
+      "ID": 169,
+      "Level": 169,
+      "value1": 2680.0,
+      "value2": 2680.0,
+      "value3": 2680.0,
+      "value4": 2680.0,
+      "value5": 2680.0,
+      "value6": 2680.0
+    },
+    {
+      "ID": 170,
+      "Level": 170,
+      "value1": 2690.0,
+      "value2": 2690.0,
+      "value3": 2690.0,
+      "value4": 2690.0,
+      "value5": 2690.0,
+      "value6": 2690.0
+    },
+    {
+      "ID": 171,
+      "Level": 171,
+      "value1": 2700.0,
+      "value2": 2700.0,
+      "value3": 2700.0,
+      "value4": 2700.0,
+      "value5": 2700.0,
+      "value6": 2700.0
+    },
+    {
+      "ID": 172,
+      "Level": 172,
+      "value1": 2710.0,
+      "value2": 2710.0,
+      "value3": 2710.0,
+      "value4": 2710.0,
+      "value5": 2710.0,
+      "value6": 2710.0
+    },
+    {
+      "ID": 173,
+      "Level": 173,
+      "value1": 2720.0,
+      "value2": 2720.0,
+      "value3": 2720.0,
+      "value4": 2720.0,
+      "value5": 2720.0,
+      "value6": 2720.0
+    },
+    {
+      "ID": 174,
+      "Level": 174,
+      "value1": 2730.0,
+      "value2": 2730.0,
+      "value3": 2730.0,
+      "value4": 2730.0,
+      "value5": 2730.0,
+      "value6": 2730.0
+    },
+    {
+      "ID": 175,
+      "Level": 175,
+      "value1": 2740.0,
+      "value2": 2740.0,
+      "value3": 2740.0,
+      "value4": 2740.0,
+      "value5": 2740.0,
+      "value6": 2740.0
+    },
+    {
+      "ID": 176,
+      "Level": 176,
+      "value1": 2750.0,
+      "value2": 2750.0,
+      "value3": 2750.0,
+      "value4": 2750.0,
+      "value5": 2750.0,
+      "value6": 2750.0
+    },
+    {
+      "ID": 177,
+      "Level": 177,
+      "value1": 2760.0,
+      "value2": 2760.0,
+      "value3": 2760.0,
+      "value4": 2760.0,
+      "value5": 2760.0,
+      "value6": 2760.0
+    },
+    {
+      "ID": 178,
+      "Level": 178,
+      "value1": 2770.0,
+      "value2": 2770.0,
+      "value3": 2770.0,
+      "value4": 2770.0,
+      "value5": 2770.0,
+      "value6": 2770.0
+    },
+    {
+      "ID": 179,
+      "Level": 179,
+      "value1": 2780.0,
+      "value2": 2780.0,
+      "value3": 2780.0,
+      "value4": 2780.0,
+      "value5": 2780.0,
+      "value6": 2780.0
+    },
+    {
+      "ID": 180,
+      "Level": 180,
+      "value1": 2790.0,
+      "value2": 2790.0,
+      "value3": 2790.0,
+      "value4": 2790.0,
+      "value5": 2790.0,
+      "value6": 2790.0
+    },
+    {
+      "ID": 181,
+      "Level": 181,
+      "value1": 2800.0,
+      "value2": 2800.0,
+      "value3": 2800.0,
+      "value4": 2800.0,
+      "value5": 2800.0,
+      "value6": 2800.0
+    },
+    {
+      "ID": 182,
+      "Level": 182,
+      "value1": 2810.0,
+      "value2": 2810.0,
+      "value3": 2810.0,
+      "value4": 2810.0,
+      "value5": 2810.0,
+      "value6": 2810.0
+    },
+    {
+      "ID": 183,
+      "Level": 183,
+      "value1": 2820.0,
+      "value2": 2820.0,
+      "value3": 2820.0,
+      "value4": 2820.0,
+      "value5": 2820.0,
+      "value6": 2820.0
+    },
+    {
+      "ID": 184,
+      "Level": 184,
+      "value1": 2830.0,
+      "value2": 2830.0,
+      "value3": 2830.0,
+      "value4": 2830.0,
+      "value5": 2830.0,
+      "value6": 2830.0
+    },
+    {
+      "ID": 185,
+      "Level": 185,
+      "value1": 2840.0,
+      "value2": 2840.0,
+      "value3": 2840.0,
+      "value4": 2840.0,
+      "value5": 2840.0,
+      "value6": 2840.0
+    },
+    {
+      "ID": 186,
+      "Level": 186,
+      "value1": 2850.0,
+      "value2": 2850.0,
+      "value3": 2850.0,
+      "value4": 2850.0,
+      "value5": 2850.0,
+      "value6": 2850.0
+    },
+    {
+      "ID": 187,
+      "Level": 187,
+      "value1": 2860.0,
+      "value2": 2860.0,
+      "value3": 2860.0,
+      "value4": 2860.0,
+      "value5": 2860.0,
+      "value6": 2860.0
+    },
+    {
+      "ID": 188,
+      "Level": 188,
+      "value1": 2870.0,
+      "value2": 2870.0,
+      "value3": 2870.0,
+      "value4": 2870.0,
+      "value5": 2870.0,
+      "value6": 2870.0
+    },
+    {
+      "ID": 189,
+      "Level": 189,
+      "value1": 2880.0,
+      "value2": 2880.0,
+      "value3": 2880.0,
+      "value4": 2880.0,
+      "value5": 2880.0,
+      "value6": 2880.0
+    },
+    {
+      "ID": 190,
+      "Level": 190,
+      "value1": 2890.0,
+      "value2": 2890.0,
+      "value3": 2890.0,
+      "value4": 2890.0,
+      "value5": 2890.0,
+      "value6": 2890.0
+    },
+    {
+      "ID": 191,
+      "Level": 191,
+      "value1": 2900.0,
+      "value2": 2900.0,
+      "value3": 2900.0,
+      "value4": 2900.0,
+      "value5": 2900.0,
+      "value6": 2900.0
+    },
+    {
+      "ID": 192,
+      "Level": 192,
+      "value1": 2910.0,
+      "value2": 2910.0,
+      "value3": 2910.0,
+      "value4": 2910.0,
+      "value5": 2910.0,
+      "value6": 2910.0
+    },
+    {
+      "ID": 193,
+      "Level": 193,
+      "value1": 2920.0,
+      "value2": 2920.0,
+      "value3": 2920.0,
+      "value4": 2920.0,
+      "value5": 2920.0,
+      "value6": 2920.0
+    },
+    {
+      "ID": 194,
+      "Level": 194,
+      "value1": 2930.0,
+      "value2": 2930.0,
+      "value3": 2930.0,
+      "value4": 2930.0,
+      "value5": 2930.0,
+      "value6": 2930.0
+    },
+    {
+      "ID": 195,
+      "Level": 195,
+      "value1": 2940.0,
+      "value2": 2940.0,
+      "value3": 2940.0,
+      "value4": 2940.0,
+      "value5": 2940.0,
+      "value6": 2940.0
+    },
+    {
+      "ID": 196,
+      "Level": 196,
+      "value1": 2950.0,
+      "value2": 2950.0,
+      "value3": 2950.0,
+      "value4": 2950.0,
+      "value5": 2950.0,
+      "value6": 2950.0
+    },
+    {
+      "ID": 197,
+      "Level": 197,
+      "value1": 2960.0,
+      "value2": 2960.0,
+      "value3": 2960.0,
+      "value4": 2960.0,
+      "value5": 2960.0,
+      "value6": 2960.0
+    },
+    {
+      "ID": 198,
+      "Level": 198,
+      "value1": 2970.0,
+      "value2": 2970.0,
+      "value3": 2970.0,
+      "value4": 2970.0,
+      "value5": 2970.0,
+      "value6": 2970.0
+    },
+    {
+      "ID": 199,
+      "Level": 199,
+      "value1": 2980.0,
+      "value2": 2980.0,
+      "value3": 2980.0,
+      "value4": 2980.0,
+      "value5": 2980.0,
+      "value6": 2980.0
+    },
+    {
+      "ID": 200,
+      "Level": 200,
+      "value1": 2990.0,
+      "value2": 2990.0,
+      "value3": 2990.0,
+      "value4": 2990.0,
+      "value5": 2990.0,
+      "value6": 2990.0
+    },
+    {
+      "ID": 201,
+      "Level": 201,
+      "value1": 3000.0,
+      "value2": 3000.0,
+      "value3": 3000.0,
+      "value4": 3000.0,
+      "value5": 3000.0,
+      "value6": 3000.0
+    },
+    {
+      "ID": 202,
+      "Level": 202,
+      "value1": 3010.0,
+      "value2": 3010.0,
+      "value3": 3010.0,
+      "value4": 3010.0,
+      "value5": 3010.0,
+      "value6": 3010.0
+    },
+    {
+      "ID": 203,
+      "Level": 203,
+      "value1": 3020.0,
+      "value2": 3020.0,
+      "value3": 3020.0,
+      "value4": 3020.0,
+      "value5": 3020.0,
+      "value6": 3020.0
+    },
+    {
+      "ID": 204,
+      "Level": 204,
+      "value1": 3030.0,
+      "value2": 3030.0,
+      "value3": 3030.0,
+      "value4": 3030.0,
+      "value5": 3030.0,
+      "value6": 3030.0
+    },
+    {
+      "ID": 205,
+      "Level": 205,
+      "value1": 3040.0,
+      "value2": 3040.0,
+      "value3": 3040.0,
+      "value4": 3040.0,
+      "value5": 3040.0,
+      "value6": 3040.0
+    },
+    {
+      "ID": 206,
+      "Level": 206,
+      "value1": 3050.0,
+      "value2": 3050.0,
+      "value3": 3050.0,
+      "value4": 3050.0,
+      "value5": 3050.0,
+      "value6": 3050.0
+    },
+    {
+      "ID": 207,
+      "Level": 207,
+      "value1": 3060.0,
+      "value2": 3060.0,
+      "value3": 3060.0,
+      "value4": 3060.0,
+      "value5": 3060.0,
+      "value6": 3060.0
+    },
+    {
+      "ID": 208,
+      "Level": 208,
+      "value1": 3070.0,
+      "value2": 3070.0,
+      "value3": 3070.0,
+      "value4": 3070.0,
+      "value5": 3070.0,
+      "value6": 3070.0
+    },
+    {
+      "ID": 209,
+      "Level": 209,
+      "value1": 3080.0,
+      "value2": 3080.0,
+      "value3": 3080.0,
+      "value4": 3080.0,
+      "value5": 3080.0,
+      "value6": 3080.0
+    },
+    {
+      "ID": 210,
+      "Level": 210,
+      "value1": 3090.0,
+      "value2": 3090.0,
+      "value3": 3090.0,
+      "value4": 3090.0,
+      "value5": 3090.0,
+      "value6": 3090.0
+    },
+    {
+      "ID": 211,
+      "Level": 211,
+      "value1": 3100.0,
+      "value2": 3100.0,
+      "value3": 3100.0,
+      "value4": 3100.0,
+      "value5": 3100.0,
+      "value6": 3100.0
+    },
+    {
+      "ID": 212,
+      "Level": 212,
+      "value1": 3110.0,
+      "value2": 3110.0,
+      "value3": 3110.0,
+      "value4": 3110.0,
+      "value5": 3110.0,
+      "value6": 3110.0
+    },
+    {
+      "ID": 213,
+      "Level": 213,
+      "value1": 3120.0,
+      "value2": 3120.0,
+      "value3": 3120.0,
+      "value4": 3120.0,
+      "value5": 3120.0,
+      "value6": 3120.0
+    },
+    {
+      "ID": 214,
+      "Level": 214,
+      "value1": 3130.0,
+      "value2": 3130.0,
+      "value3": 3130.0,
+      "value4": 3130.0,
+      "value5": 3130.0,
+      "value6": 3130.0
+    },
+    {
+      "ID": 215,
+      "Level": 215,
+      "value1": 3140.0,
+      "value2": 3140.0,
+      "value3": 3140.0,
+      "value4": 3140.0,
+      "value5": 3140.0,
+      "value6": 3140.0
+    },
+    {
+      "ID": 216,
+      "Level": 216,
+      "value1": 3150.0,
+      "value2": 3150.0,
+      "value3": 3150.0,
+      "value4": 3150.0,
+      "value5": 3150.0,
+      "value6": 3150.0
+    },
+    {
+      "ID": 217,
+      "Level": 217,
+      "value1": 3160.0,
+      "value2": 3160.0,
+      "value3": 3160.0,
+      "value4": 3160.0,
+      "value5": 3160.0,
+      "value6": 3160.0
+    },
+    {
+      "ID": 218,
+      "Level": 218,
+      "value1": 3170.0,
+      "value2": 3170.0,
+      "value3": 3170.0,
+      "value4": 3170.0,
+      "value5": 3170.0,
+      "value6": 3170.0
+    },
+    {
+      "ID": 219,
+      "Level": 219,
+      "value1": 3180.0,
+      "value2": 3180.0,
+      "value3": 3180.0,
+      "value4": 3180.0,
+      "value5": 3180.0,
+      "value6": 3180.0
+    },
+    {
+      "ID": 220,
+      "Level": 220,
+      "value1": 3190.0,
+      "value2": 3190.0,
+      "value3": 3190.0,
+      "value4": 3190.0,
+      "value5": 3190.0,
+      "value6": 3190.0
+    },
+    {
+      "ID": 221,
+      "Level": 221,
+      "value1": 3200.0,
+      "value2": 3200.0,
+      "value3": 3200.0,
+      "value4": 3200.0,
+      "value5": 3200.0,
+      "value6": 3200.0
+    },
+    {
+      "ID": 222,
+      "Level": 222,
+      "value1": 3210.0,
+      "value2": 3210.0,
+      "value3": 3210.0,
+      "value4": 3210.0,
+      "value5": 3210.0,
+      "value6": 3210.0
+    },
+    {
+      "ID": 223,
+      "Level": 223,
+      "value1": 3220.0,
+      "value2": 3220.0,
+      "value3": 3220.0,
+      "value4": 3220.0,
+      "value5": 3220.0,
+      "value6": 3220.0
+    },
+    {
+      "ID": 224,
+      "Level": 224,
+      "value1": 3230.0,
+      "value2": 3230.0,
+      "value3": 3230.0,
+      "value4": 3230.0,
+      "value5": 3230.0,
+      "value6": 3230.0
+    },
+    {
+      "ID": 225,
+      "Level": 225,
+      "value1": 3240.0,
+      "value2": 3240.0,
+      "value3": 3240.0,
+      "value4": 3240.0,
+      "value5": 3240.0,
+      "value6": 3240.0
+    },
+    {
+      "ID": 226,
+      "Level": 226,
+      "value1": 3250.0,
+      "value2": 3250.0,
+      "value3": 3250.0,
+      "value4": 3250.0,
+      "value5": 3250.0,
+      "value6": 3250.0
+    },
+    {
+      "ID": 227,
+      "Level": 227,
+      "value1": 3260.0,
+      "value2": 3260.0,
+      "value3": 3260.0,
+      "value4": 3260.0,
+      "value5": 3260.0,
+      "value6": 3260.0
+    },
+    {
+      "ID": 228,
+      "Level": 228,
+      "value1": 3270.0,
+      "value2": 3270.0,
+      "value3": 3270.0,
+      "value4": 3270.0,
+      "value5": 3270.0,
+      "value6": 3270.0
+    },
+    {
+      "ID": 229,
+      "Level": 229,
+      "value1": 3280.0,
+      "value2": 3280.0,
+      "value3": 3280.0,
+      "value4": 3280.0,
+      "value5": 3280.0,
+      "value6": 3280.0
+    },
+    {
+      "ID": 230,
+      "Level": 230,
+      "value1": 3290.0,
+      "value2": 3290.0,
+      "value3": 3290.0,
+      "value4": 3290.0,
+      "value5": 3290.0,
+      "value6": 3290.0
+    },
+    {
+      "ID": 231,
+      "Level": 231,
+      "value1": 3300.0,
+      "value2": 3300.0,
+      "value3": 3300.0,
+      "value4": 3300.0,
+      "value5": 3300.0,
+      "value6": 3300.0
+    },
+    {
+      "ID": 232,
+      "Level": 232,
+      "value1": 3310.0,
+      "value2": 3310.0,
+      "value3": 3310.0,
+      "value4": 3310.0,
+      "value5": 3310.0,
+      "value6": 3310.0
+    },
+    {
+      "ID": 233,
+      "Level": 233,
+      "value1": 3320.0,
+      "value2": 3320.0,
+      "value3": 3320.0,
+      "value4": 3320.0,
+      "value5": 3320.0,
+      "value6": 3320.0
+    },
+    {
+      "ID": 234,
+      "Level": 234,
+      "value1": 3330.0,
+      "value2": 3330.0,
+      "value3": 3330.0,
+      "value4": 3330.0,
+      "value5": 3330.0,
+      "value6": 3330.0
+    },
+    {
+      "ID": 235,
+      "Level": 235,
+      "value1": 3340.0,
+      "value2": 3340.0,
+      "value3": 3340.0,
+      "value4": 3340.0,
+      "value5": 3340.0,
+      "value6": 3340.0
+    },
+    {
+      "ID": 236,
+      "Level": 236,
+      "value1": 3350.0,
+      "value2": 3350.0,
+      "value3": 3350.0,
+      "value4": 3350.0,
+      "value5": 3350.0,
+      "value6": 3350.0
+    },
+    {
+      "ID": 237,
+      "Level": 237,
+      "value1": 3360.0,
+      "value2": 3360.0,
+      "value3": 3360.0,
+      "value4": 3360.0,
+      "value5": 3360.0,
+      "value6": 3360.0
+    },
+    {
+      "ID": 238,
+      "Level": 238,
+      "value1": 3370.0,
+      "value2": 3370.0,
+      "value3": 3370.0,
+      "value4": 3370.0,
+      "value5": 3370.0,
+      "value6": 3370.0
+    },
+    {
+      "ID": 239,
+      "Level": 239,
+      "value1": 3380.0,
+      "value2": 3380.0,
+      "value3": 3380.0,
+      "value4": 3380.0,
+      "value5": 3380.0,
+      "value6": 3380.0
+    },
+    {
+      "ID": 240,
+      "Level": 240,
+      "value1": 3390.0,
+      "value2": 3390.0,
+      "value3": 3390.0,
+      "value4": 3390.0,
+      "value5": 3390.0,
+      "value6": 3390.0
+    },
+    {
+      "ID": 241,
+      "Level": 241,
+      "value1": 3400.0,
+      "value2": 3400.0,
+      "value3": 3400.0,
+      "value4": 3400.0,
+      "value5": 3400.0,
+      "value6": 3400.0
+    },
+    {
+      "ID": 242,
+      "Level": 242,
+      "value1": 3410.0,
+      "value2": 3410.0,
+      "value3": 3410.0,
+      "value4": 3410.0,
+      "value5": 3410.0,
+      "value6": 3410.0
+    },
+    {
+      "ID": 243,
+      "Level": 243,
+      "value1": 3420.0,
+      "value2": 3420.0,
+      "value3": 3420.0,
+      "value4": 3420.0,
+      "value5": 3420.0,
+      "value6": 3420.0
+    },
+    {
+      "ID": 244,
+      "Level": 244,
+      "value1": 3430.0,
+      "value2": 3430.0,
+      "value3": 3430.0,
+      "value4": 3430.0,
+      "value5": 3430.0,
+      "value6": 3430.0
+    },
+    {
+      "ID": 245,
+      "Level": 245,
+      "value1": 3440.0,
+      "value2": 3440.0,
+      "value3": 3440.0,
+      "value4": 3440.0,
+      "value5": 3440.0,
+      "value6": 3440.0
+    },
+    {
+      "ID": 246,
+      "Level": 246,
+      "value1": 3450.0,
+      "value2": 3450.0,
+      "value3": 3450.0,
+      "value4": 3450.0,
+      "value5": 3450.0,
+      "value6": 3450.0
+    },
+    {
+      "ID": 247,
+      "Level": 247,
+      "value1": 3460.0,
+      "value2": 3460.0,
+      "value3": 3460.0,
+      "value4": 3460.0,
+      "value5": 3460.0,
+      "value6": 3460.0
+    },
+    {
+      "ID": 248,
+      "Level": 248,
+      "value1": 3470.0,
+      "value2": 3470.0,
+      "value3": 3470.0,
+      "value4": 3470.0,
+      "value5": 3470.0,
+      "value6": 3470.0
+    },
+    {
+      "ID": 249,
+      "Level": 249,
+      "value1": 3480.0,
+      "value2": 3480.0,
+      "value3": 3480.0,
+      "value4": 3480.0,
+      "value5": 3480.0,
+      "value6": 3480.0
+    },
+    {
+      "ID": 250,
+      "Level": 250,
+      "value1": 3490.0,
+      "value2": 3490.0,
+      "value3": 3490.0,
+      "value4": 3490.0,
+      "value5": 3490.0,
+      "value6": 3490.0
+    },
+    {
+      "ID": 251,
+      "Level": 251,
+      "value1": 3500.0,
+      "value2": 3500.0,
+      "value3": 3500.0,
+      "value4": 3500.0,
+      "value5": 3500.0,
+      "value6": 3500.0
+    },
+    {
+      "ID": 252,
+      "Level": 252,
+      "value1": 3510.0,
+      "value2": 3510.0,
+      "value3": 3510.0,
+      "value4": 3510.0,
+      "value5": 3510.0,
+      "value6": 3510.0
+    },
+    {
+      "ID": 253,
+      "Level": 253,
+      "value1": 3520.0,
+      "value2": 3520.0,
+      "value3": 3520.0,
+      "value4": 3520.0,
+      "value5": 3520.0,
+      "value6": 3520.0
+    },
+    {
+      "ID": 254,
+      "Level": 254,
+      "value1": 3530.0,
+      "value2": 3530.0,
+      "value3": 3530.0,
+      "value4": 3530.0,
+      "value5": 3530.0,
+      "value6": 3530.0
+    },
+    {
+      "ID": 255,
+      "Level": 255,
+      "value1": 3540.0,
+      "value2": 3540.0,
+      "value3": 3540.0,
+      "value4": 3540.0,
+      "value5": 3540.0,
+      "value6": 3540.0
+    },
+    {
+      "ID": 256,
+      "Level": 256,
+      "value1": 3550.0,
+      "value2": 3550.0,
+      "value3": 3550.0,
+      "value4": 3550.0,
+      "value5": 3550.0,
+      "value6": 3550.0
+    },
+    {
+      "ID": 257,
+      "Level": 257,
+      "value1": 3560.0,
+      "value2": 3560.0,
+      "value3": 3560.0,
+      "value4": 3560.0,
+      "value5": 3560.0,
+      "value6": 3560.0
+    },
+    {
+      "ID": 258,
+      "Level": 258,
+      "value1": 3570.0,
+      "value2": 3570.0,
+      "value3": 3570.0,
+      "value4": 3570.0,
+      "value5": 3570.0,
+      "value6": 3570.0
+    },
+    {
+      "ID": 259,
+      "Level": 259,
+      "value1": 3580.0,
+      "value2": 3580.0,
+      "value3": 3580.0,
+      "value4": 3580.0,
+      "value5": 3580.0,
+      "value6": 3580.0
+    },
+    {
+      "ID": 260,
+      "Level": 260,
+      "value1": 3590.0,
+      "value2": 3590.0,
+      "value3": 3590.0,
+      "value4": 3590.0,
+      "value5": 3590.0,
+      "value6": 3590.0
+    },
+    {
+      "ID": 261,
+      "Level": 261,
+      "value1": 3600.0,
+      "value2": 3600.0,
+      "value3": 3600.0,
+      "value4": 3600.0,
+      "value5": 3600.0,
+      "value6": 3600.0
+    },
+    {
+      "ID": 262,
+      "Level": 262,
+      "value1": 3610.0,
+      "value2": 3610.0,
+      "value3": 3610.0,
+      "value4": 3610.0,
+      "value5": 3610.0,
+      "value6": 3610.0
+    },
+    {
+      "ID": 263,
+      "Level": 263,
+      "value1": 3620.0,
+      "value2": 3620.0,
+      "value3": 3620.0,
+      "value4": 3620.0,
+      "value5": 3620.0,
+      "value6": 3620.0
+    },
+    {
+      "ID": 264,
+      "Level": 264,
+      "value1": 3630.0,
+      "value2": 3630.0,
+      "value3": 3630.0,
+      "value4": 3630.0,
+      "value5": 3630.0,
+      "value6": 3630.0
+    },
+    {
+      "ID": 265,
+      "Level": 265,
+      "value1": 3640.0,
+      "value2": 3640.0,
+      "value3": 3640.0,
+      "value4": 3640.0,
+      "value5": 3640.0,
+      "value6": 3640.0
+    },
+    {
+      "ID": 266,
+      "Level": 266,
+      "value1": 3650.0,
+      "value2": 3650.0,
+      "value3": 3650.0,
+      "value4": 3650.0,
+      "value5": 3650.0,
+      "value6": 3650.0
+    },
+    {
+      "ID": 267,
+      "Level": 267,
+      "value1": 3660.0,
+      "value2": 3660.0,
+      "value3": 3660.0,
+      "value4": 3660.0,
+      "value5": 3660.0,
+      "value6": 3660.0
+    },
+    {
+      "ID": 268,
+      "Level": 268,
+      "value1": 3670.0,
+      "value2": 3670.0,
+      "value3": 3670.0,
+      "value4": 3670.0,
+      "value5": 3670.0,
+      "value6": 3670.0
+    },
+    {
+      "ID": 269,
+      "Level": 269,
+      "value1": 3680.0,
+      "value2": 3680.0,
+      "value3": 3680.0,
+      "value4": 3680.0,
+      "value5": 3680.0,
+      "value6": 3680.0
+    },
+    {
+      "ID": 270,
+      "Level": 270,
+      "value1": 3690.0,
+      "value2": 3690.0,
+      "value3": 3690.0,
+      "value4": 3690.0,
+      "value5": 3690.0,
+      "value6": 3690.0
+    },
+    {
+      "ID": 271,
+      "Level": 271,
+      "value1": 3700.0,
+      "value2": 3700.0,
+      "value3": 3700.0,
+      "value4": 3700.0,
+      "value5": 3700.0,
+      "value6": 3700.0
+    },
+    {
+      "ID": 272,
+      "Level": 272,
+      "value1": 3710.0,
+      "value2": 3710.0,
+      "value3": 3710.0,
+      "value4": 3710.0,
+      "value5": 3710.0,
+      "value6": 3710.0
+    },
+    {
+      "ID": 273,
+      "Level": 273,
+      "value1": 3720.0,
+      "value2": 3720.0,
+      "value3": 3720.0,
+      "value4": 3720.0,
+      "value5": 3720.0,
+      "value6": 3720.0
+    },
+    {
+      "ID": 274,
+      "Level": 274,
+      "value1": 3730.0,
+      "value2": 3730.0,
+      "value3": 3730.0,
+      "value4": 3730.0,
+      "value5": 3730.0,
+      "value6": 3730.0
+    },
+    {
+      "ID": 275,
+      "Level": 275,
+      "value1": 3740.0,
+      "value2": 3740.0,
+      "value3": 3740.0,
+      "value4": 3740.0,
+      "value5": 3740.0,
+      "value6": 3740.0
+    },
+    {
+      "ID": 276,
+      "Level": 276,
+      "value1": 3750.0,
+      "value2": 3750.0,
+      "value3": 3750.0,
+      "value4": 3750.0,
+      "value5": 3750.0,
+      "value6": 3750.0
+    },
+    {
+      "ID": 277,
+      "Level": 277,
+      "value1": 3760.0,
+      "value2": 3760.0,
+      "value3": 3760.0,
+      "value4": 3760.0,
+      "value5": 3760.0,
+      "value6": 3760.0
+    },
+    {
+      "ID": 278,
+      "Level": 278,
+      "value1": 3770.0,
+      "value2": 3770.0,
+      "value3": 3770.0,
+      "value4": 3770.0,
+      "value5": 3770.0,
+      "value6": 3770.0
+    },
+    {
+      "ID": 279,
+      "Level": 279,
+      "value1": 3780.0,
+      "value2": 3780.0,
+      "value3": 3780.0,
+      "value4": 3780.0,
+      "value5": 3780.0,
+      "value6": 3780.0
+    },
+    {
+      "ID": 280,
+      "Level": 280,
+      "value1": 3790.0,
+      "value2": 3790.0,
+      "value3": 3790.0,
+      "value4": 3790.0,
+      "value5": 3790.0,
+      "value6": 3790.0
+    },
+    {
+      "ID": 281,
+      "Level": 281,
+      "value1": 3800.0,
+      "value2": 3800.0,
+      "value3": 3800.0,
+      "value4": 3800.0,
+      "value5": 3800.0,
+      "value6": 3800.0
+    },
+    {
+      "ID": 282,
+      "Level": 282,
+      "value1": 3810.0,
+      "value2": 3810.0,
+      "value3": 3810.0,
+      "value4": 3810.0,
+      "value5": 3810.0,
+      "value6": 3810.0
+    },
+    {
+      "ID": 283,
+      "Level": 283,
+      "value1": 3820.0,
+      "value2": 3820.0,
+      "value3": 3820.0,
+      "value4": 3820.0,
+      "value5": 3820.0,
+      "value6": 3820.0
+    },
+    {
+      "ID": 284,
+      "Level": 284,
+      "value1": 3830.0,
+      "value2": 3830.0,
+      "value3": 3830.0,
+      "value4": 3830.0,
+      "value5": 3830.0,
+      "value6": 3830.0
+    },
+    {
+      "ID": 285,
+      "Level": 285,
+      "value1": 3840.0,
+      "value2": 3840.0,
+      "value3": 3840.0,
+      "value4": 3840.0,
+      "value5": 3840.0,
+      "value6": 3840.0
+    },
+    {
+      "ID": 286,
+      "Level": 286,
+      "value1": 3850.0,
+      "value2": 3850.0,
+      "value3": 3850.0,
+      "value4": 3850.0,
+      "value5": 3850.0,
+      "value6": 3850.0
+    },
+    {
+      "ID": 287,
+      "Level": 287,
+      "value1": 3860.0,
+      "value2": 3860.0,
+      "value3": 3860.0,
+      "value4": 3860.0,
+      "value5": 3860.0,
+      "value6": 3860.0
+    },
+    {
+      "ID": 288,
+      "Level": 288,
+      "value1": 3870.0,
+      "value2": 3870.0,
+      "value3": 3870.0,
+      "value4": 3870.0,
+      "value5": 3870.0,
+      "value6": 3870.0
+    },
+    {
+      "ID": 289,
+      "Level": 289,
+      "value1": 3880.0,
+      "value2": 3880.0,
+      "value3": 3880.0,
+      "value4": 3880.0,
+      "value5": 3880.0,
+      "value6": 3880.0
+    },
+    {
+      "ID": 290,
+      "Level": 290,
+      "value1": 3890.0,
+      "value2": 3890.0,
+      "value3": 3890.0,
+      "value4": 3890.0,
+      "value5": 3890.0,
+      "value6": 3890.0
+    },
+    {
+      "ID": 291,
+      "Level": 291,
+      "value1": 3900.0,
+      "value2": 3900.0,
+      "value3": 3900.0,
+      "value4": 3900.0,
+      "value5": 3900.0,
+      "value6": 3900.0
+    },
+    {
+      "ID": 292,
+      "Level": 292,
+      "value1": 3910.0,
+      "value2": 3910.0,
+      "value3": 3910.0,
+      "value4": 3910.0,
+      "value5": 3910.0,
+      "value6": 3910.0
+    },
+    {
+      "ID": 293,
+      "Level": 293,
+      "value1": 3920.0,
+      "value2": 3920.0,
+      "value3": 3920.0,
+      "value4": 3920.0,
+      "value5": 3920.0,
+      "value6": 3920.0
+    },
+    {
+      "ID": 294,
+      "Level": 294,
+      "value1": 3930.0,
+      "value2": 3930.0,
+      "value3": 3930.0,
+      "value4": 3930.0,
+      "value5": 3930.0,
+      "value6": 3930.0
+    },
+    {
+      "ID": 295,
+      "Level": 295,
+      "value1": 3940.0,
+      "value2": 3940.0,
+      "value3": 3940.0,
+      "value4": 3940.0,
+      "value5": 3940.0,
+      "value6": 3940.0
+    },
+    {
+      "ID": 296,
+      "Level": 296,
+      "value1": 3950.0,
+      "value2": 3950.0,
+      "value3": 3950.0,
+      "value4": 3950.0,
+      "value5": 3950.0,
+      "value6": 3950.0
+    },
+    {
+      "ID": 297,
+      "Level": 297,
+      "value1": 3960.0,
+      "value2": 3960.0,
+      "value3": 3960.0,
+      "value4": 3960.0,
+      "value5": 3960.0,
+      "value6": 3960.0
+    },
+    {
+      "ID": 298,
+      "Level": 298,
+      "value1": 3970.0,
+      "value2": 3970.0,
+      "value3": 3970.0,
+      "value4": 3970.0,
+      "value5": 3970.0,
+      "value6": 3970.0
+    },
+    {
+      "ID": 299,
+      "Level": 299,
+      "value1": 3980.0,
+      "value2": 3980.0,
+      "value3": 3980.0,
+      "value4": 3980.0,
+      "value5": 3980.0,
+      "value6": 3980.0
+    },
+    {
+      "ID": 300,
+      "Level": 300,
+      "value1": 3990.0,
+      "value2": 3990.0,
+      "value3": 3990.0,
+      "value4": 3990.0,
+      "value5": 3990.0,
+      "value6": 3990.0
+    }
+  ]
+}

+ 7 - 0
Assets/Res/Config/ResourceLevelConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XX4a4375W3M6UzrgaE5PxHvAQGjTue+8GHCdFmH+Wx1c7dshbm6EDsE8sa5p
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 233 - 256
Assets/Res/Config/SkillConfig.json


+ 80 - 0
Assets/Res/Config/TaskConfig.json

@@ -0,0 +1,80 @@
+{
+  "configList": [
+    {
+      "ID": 1,
+      "taskName": 1906,
+      "Description": 1914,
+      "conciseTaskMessage": 1910,
+      "mapID": 1,
+      "taskType": 10,
+      "finishConditionType": 3,
+      "finishVlaue": [
+        1914
+      ],
+      "finishCount": 1,
+      "awardItemId": [
+        1002
+      ],
+      "awardItemCount": [
+        10
+      ],
+      "unlockType": -1,
+      "unlockLevel": 1,
+      "nextTaskID": 2
+    },
+    {
+      "ID": 2,
+      "taskName": 1907,
+      "Description": 1915,
+      "conciseTaskMessage": 1911,
+      "mapID": 1,
+      "taskType": 10,
+      "finishConditionType": 2,
+      "finishVlaue": [
+        100001
+      ],
+      "finishCount": 2,
+      "unlockType": -1,
+      "unlockLevel": 1,
+      "nextTaskID": 3
+    },
+    {
+      "ID": 3,
+      "taskName": 1908,
+      "Description": 1916,
+      "conciseTaskMessage": 1912,
+      "mapID": 1,
+      "taskType": 10,
+      "finishConditionType": 1,
+      "finishVlaue": [
+        1001
+      ],
+      "finishCount": 1,
+      "unlockType": -1,
+      "unlockLevel": 1,
+      "nextTaskID": 4
+    },
+    {
+      "ID": 4,
+      "taskName": 1909,
+      "Description": 1917,
+      "conciseTaskMessage": 1913,
+      "mapID": 1,
+      "taskType": 10,
+      "finishConditionType": 4,
+      "finishVlaue": [
+        10
+      ],
+      "finishCount": 1,
+      "awardItemId": [
+        1003
+      ],
+      "awardItemCount": [
+        1
+      ],
+      "unlockType": -1,
+      "unlockLevel": 1,
+      "nextTaskID": 0
+    }
+  ]
+}

+ 7 - 0
Assets/Res/Config/TaskConfig.json.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CX5Ot3+lAC2LKpT1E57KULwqTMx8oMG4gzY92K2eKwlIJ8OuJ/lgPsFsdfVS
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Res/UI/MainHeroPanel/7e504e2eddd927a85270d0ff0b6362fa.png


+ 37 - 53
Assets/Res/UI/MainHeroPanel/FaBaoAttributeWidget.prefab

@@ -42,7 +42,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 235.6681, y: 60.0699}
+  m_SizeDelta: {x: 233, y: 88}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5451924722642203252
 --- !u!222 &5451924722642203252
 CanvasRenderer:
 CanvasRenderer:
@@ -82,14 +82,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_fbshuziDiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -168,8 +168,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: -48.5, y: -6.1}
-  m_SizeDelta: {x: 43.718002, y: 29.1454}
+  m_AnchoredPosition: {x: -22.5, y: 6.5156}
+  m_SizeDelta: {x: 29, y: 25}
   m_Pivot: {x: 1, y: 0.5}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &6171417124027095956
 --- !u!222 &6171417124027095956
 CanvasRenderer:
 CanvasRenderer:
@@ -209,14 +209,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_tisheng
+  _icon_name: dec_fbjia
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 48eeb3c8a9b4122a73f0a85aab21a52f
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -256,8 +256,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 13.8, y: 2.1}
-  m_SizeDelta: {x: 37.9765, y: 37.9765}
+  m_AnchoredPosition: {x: 13.8, y: -3.3}
+  m_SizeDelta: {x: 45, y: 44}
   m_Pivot: {x: 0, y: 0.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &5668749800429005958
 --- !u!222 &5668749800429005958
 CanvasRenderer:
 CanvasRenderer:
@@ -297,14 +297,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_skill_20001
+  _icon_name: dec_fbfangyu
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: skillIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
-    lasetJsonGUID: 151dde130cdc5228de9614f608886409
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -344,7 +344,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 47.3, y: -12.67}
+  m_AnchoredPosition: {x: 88.736, y: -22.033}
   m_SizeDelta: {x: 61.3275, y: 34.73}
   m_SizeDelta: {x: 61.3275, y: 34.73}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4400891513561527877
 --- !u!222 &4400891513561527877
@@ -368,7 +368,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.21568629, g: 0.34509805, b: 0.5058824, a: 1}
+  m_Color: {r: 0.058823533, g: 0.9450981, b: 0.5882353, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -376,7 +376,7 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 30
     m_FontSize: 30
     m_FontStyle: 0
     m_FontStyle: 0
     m_BestFit: 0
     m_BestFit: 0
@@ -400,7 +400,6 @@ GameObject:
   - component: {fileID: 2124160756088033247}
   - component: {fileID: 2124160756088033247}
   - component: {fileID: 2682902642707814625}
   - component: {fileID: 2682902642707814625}
   - component: {fileID: 5453716932949606486}
   - component: {fileID: 5453716932949606486}
-  - component: {fileID: 7108563849620962755}
   m_Layer: 0
   m_Layer: 0
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: Text_AttributeValue
   m_Name: Text_AttributeValue
@@ -425,8 +424,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 23.3, y: -12.67}
-  m_SizeDelta: {x: 160, y: 34.73}
+  m_AnchoredPosition: {x: 13.336102, y: -22.033}
+  m_SizeDelta: {x: 92.0722, y: 34.73}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2682902642707814625
 --- !u!222 &2682902642707814625
 CanvasRenderer:
 CanvasRenderer:
@@ -449,7 +448,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.7254902, g: 0.8078432, b: 0.7411765, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -457,7 +456,7 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_FontSize: 30
     m_FontSize: 30
     m_FontStyle: 1
     m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
@@ -469,22 +468,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
-  m_Text: 700
---- !u!114 &7108563849620962755
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8065451786835388400}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
-  m_UseGraphicAlpha: 1
+  m_Text: 999
 --- !u!1 &9027844748205313255
 --- !u!1 &9027844748205313255
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -520,8 +504,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 23.3, y: 13.117}
-  m_SizeDelta: {x: 160, y: 26.234}
+  m_AnchoredPosition: {x: 39.4, y: 12}
+  m_SizeDelta: {x: 160, y: 33.3358}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7266792496980045858
 --- !u!222 &7266792496980045858
 CanvasRenderer:
 CanvasRenderer:
@@ -544,7 +528,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.7254902, g: 0.8078432, b: 0.7411765, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -552,9 +536,9 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 18
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 30
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
     m_MaxSize: 40
     m_MaxSize: 40

+ 190 - 96
Assets/Res/UI/MainHeroPanel/FaBaoSkillWidget.prefab

@@ -1,5 +1,93 @@
 %YAML 1.1
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &545302221582157102
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7129915623901783369}
+  - component: {fileID: 7267428274269730178}
+  - component: {fileID: 4043644650560537861}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Select
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7129915623901783369
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 545302221582157102}
+  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: 6381789741947326869}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 1.1824036, y: -0.4368}
+  m_SizeDelta: {x: 20.2514, y: 14.3129}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7267428274269730178
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 545302221582157102}
+  m_CullTransparentMesh: 1
+--- !u!114 &4043644650560537861
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 545302221582157102}
+  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_gfxxlanXuanzhong
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  packInfo:
+    packName: gongfa
+    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
+    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
+    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &933837835662493314
 --- !u!1 &933837835662493314
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -80,6 +168,94 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: "\u7B49\u7EA740"
   m_Text: "\u7B49\u7EA740"
+--- !u!1 &2523622690758838143
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7307063218653812041}
+  - component: {fileID: 7281893260405876919}
+  - component: {fileID: 885599995918766300}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Marsk
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7307063218653812041
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2523622690758838143}
+  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: 6381789741947326869}
+  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 &7281893260405876919
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2523622690758838143}
+  m_CullTransparentMesh: 1
+--- !u!114 &885599995918766300
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2523622690758838143}
+  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, g: 0, b: 0, a: 0.6392157}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_tiaomulandiban
+  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: d4e5a262b3976e33870ab7190f3a5bdb
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &2805748617486996592
 --- !u!1 &2805748617486996592
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -160,12 +336,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_tiaomulandiban
   _icon_name: dec_tiaomulandiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -282,7 +458,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 1072277084362475463}
   - {fileID: 1072277084362475463}
-  - {fileID: 8932511951117402614}
+  - {fileID: 7307063218653812041}
+  - {fileID: 7129915623901783369}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMin: {x: 0, y: 1}
@@ -321,97 +498,14 @@ MonoBehaviour:
     isAssetBundle: 0
     isAssetBundle: 0
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
-  - key: Icon_CurrentUpGrade
-    gameObject: {fileID: 8798180319087261071}
+  - key: Icon_Select
+    gameObject: {fileID: 4043644650560537861}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Icon_Marsk
+    gameObject: {fileID: 885599995918766300}
     isAssetBundle: 0
     isAssetBundle: 0
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
   isAssetBundle: 1
   isAssetBundle: 1
---- !u!1 &9032091724309476061
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8932511951117402614}
-  - component: {fileID: 4094337527001214804}
-  - component: {fileID: 8798180319087261071}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Icon_CurrentUpGrade
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &8932511951117402614
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9032091724309476061}
-  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: 6381789741947326869}
-  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 &4094337527001214804
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9032091724309476061}
-  m_CullTransparentMesh: 1
---- !u!114 &8798180319087261071
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 9032091724309476061}
-  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.32156864, g: 0.9215687, b: 0.56078434, 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: 
-  isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
-  packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
-  useGradient: 0
-  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
-  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
-  direction: 0

+ 167 - 27
Assets/Res/UI/MainHeroPanel/FaBaoWidget.prefab

@@ -30,17 +30,18 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
+  - {fileID: 4079181251502646369}
+  - {fileID: 7967044477790616257}
   - {fileID: 3600548847287801475}
   - {fileID: 3600548847287801475}
   - {fileID: 6715878191117609555}
   - {fileID: 6715878191117609555}
-  - {fileID: 1882091923597765978}
   - {fileID: 8982381730593164203}
   - {fileID: 8982381730593164203}
   m_Father: {fileID: 3921069648395711794}
   m_Father: {fileID: 3921069648395711794}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 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: 100, y: 118}
-  m_Pivot: {x: 0.5, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -0.19999695}
+  m_SizeDelta: {x: 139, y: 173}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &892032992034649656
 --- !u!222 &892032992034649656
 CanvasRenderer:
 CanvasRenderer:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -84,8 +85,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.9, y: 4.5}
-  m_SizeDelta: {x: 74.3715, y: 74.3715}
+  m_AnchoredPosition: {x: 0.8, y: -0.69999695}
+  m_SizeDelta: {x: 110, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2176209277412620002
 --- !u!222 &2176209277412620002
 CanvasRenderer:
 CanvasRenderer:
@@ -117,7 +118,7 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Sprite: {fileID: 0}
   m_Type: 0
   m_Type: 0
-  m_PreserveAspect: 0
+  m_PreserveAspect: 1
   m_FillCenter: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillMethod: 4
   m_FillAmount: 1
   m_FillAmount: 1
@@ -125,7 +126,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_skill_20001
+  _icon_name: icon_fb3401
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   packInfo:
   packInfo:
@@ -167,13 +168,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 1882091923597765978}
   m_Father: {fileID: 7201230285343381440}
   m_Father: {fileID: 7201230285343381440}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 1.8999939, y: -31.00003}
-  m_SizeDelta: {x: 100, y: 38.0645}
+  m_AnchoredPosition: {x: 1.8999939, y: -1.699997}
+  m_SizeDelta: {x: 91, y: 28}
   m_Pivot: {x: 0.5, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &3372643250122354884
 --- !u!222 &3372643250122354884
 CanvasRenderer:
 CanvasRenderer:
@@ -196,7 +198,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0.7294118, b: 0.6784314, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -213,14 +215,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_23
+  _icon_name: dec_fbDengjiDiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -343,7 +345,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 254, y: -537.89996}
   m_AnchoredPosition: {x: 254, y: -537.89996}
-  m_SizeDelta: {x: 123, y: 158}
+  m_SizeDelta: {x: 139, y: 173}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4206748544152034842
 --- !u!222 &4206748544152034842
 CanvasRenderer:
 CanvasRenderer:
@@ -423,6 +425,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isAssetBundle: 0
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
+  - key: SelectRoot
+    gameObject: {fileID: 7967044477790616257}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
   isAssetBundle: 1
 --- !u!1 &6343252469116327960
 --- !u!1 &6343252469116327960
 GameObject:
 GameObject:
@@ -460,8 +467,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 6.5, y: 17.4}
-  m_SizeDelta: {x: 51.0764, y: 23.5821}
+  m_AnchoredPosition: {x: -15.8, y: -10.1}
+  m_SizeDelta: {x: 66.0283, y: 20.3164}
   m_Pivot: {x: 1, y: 1}
   m_Pivot: {x: 1, y: 1}
 --- !u!222 &469252788800658108
 --- !u!222 &469252788800658108
 CanvasRenderer:
 CanvasRenderer:
@@ -513,6 +520,94 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
   direction: 0
+--- !u!1 &6781938194676634166
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4079181251502646369}
+  - component: {fileID: 8235790614172582128}
+  - component: {fileID: 7766684938479821689}
+  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 &4079181251502646369
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6781938194676634166}
+  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: 7201230285343381440}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 139, y: 173}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &8235790614172582128
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6781938194676634166}
+  m_CullTransparentMesh: 1
+--- !u!114 &7766684938479821689
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6781938194676634166}
+  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_fbDiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
+  packInfo:
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
 --- !u!1 &7440336937034317621
 --- !u!1 &7440336937034317621
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -544,11 +639,11 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 7201230285343381440}
+  m_Father: {fileID: 6715878191117609555}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 1.9, y: -30}
+  m_AnchoredPosition: {x: 0.000036597252, y: 1.000061}
   m_SizeDelta: {x: 160, y: 30}
   m_SizeDelta: {x: 160, y: 30}
   m_Pivot: {x: 0.5, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &8341102112999275379
 --- !u!222 &8341102112999275379
@@ -572,7 +667,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_Color: {r: 0.61960787, g: 0.4431373, b: 0.2627451, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -582,7 +677,7 @@ MonoBehaviour:
   m_FontData:
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 16
     m_FontSize: 16
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
     m_MaxSize: 40
     m_MaxSize: 40
@@ -593,3 +688,48 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: "1\u7EA7"
   m_Text: "1\u7EA7"
+--- !u!1 &8961001361686834509
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7967044477790616257}
+  - component: {fileID: 7669926220410097028}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: SelectRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7967044477790616257
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8961001361686834509}
+  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: 7201230285343381440}
+  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: 4.6}
+  m_SizeDelta: {x: 141, y: 175}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7669926220410097028
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8961001361686834509}
+  m_CullTransparentMesh: 1

+ 329 - 127
Assets/Res/UI/MainHeroPanel/SelectFaBaoPanel.prefab

@@ -90,7 +90,6 @@ GameObject:
   m_Component:
   m_Component:
   - component: {fileID: 2641489887301634299}
   - component: {fileID: 2641489887301634299}
   - component: {fileID: 4770501070276458198}
   - component: {fileID: 4770501070276458198}
-  - component: {fileID: 6455316414502444682}
   m_Layer: 0
   m_Layer: 0
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: CurrentFaBaoRoot
   m_Name: CurrentFaBaoRoot
@@ -108,15 +107,15 @@ RectTransform:
   m_GameObject: {fileID: 1048431458388444575}
   m_GameObject: {fileID: 1048431458388444575}
   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_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_LocalScale: {x: 1.2, y: 1.2, z: 1.2}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Children: []
-  m_Father: {fileID: 4776823611480169892}
+  m_Father: {fileID: 2305457027140451751}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -266.9, y: 84}
-  m_SizeDelta: {x: 142.1363, y: 144.69}
+  m_AnchoredPosition: {x: 0.000061035156, y: 25}
+  m_SizeDelta: {x: 139, y: 173}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4770501070276458198
 --- !u!222 &4770501070276458198
 CanvasRenderer:
 CanvasRenderer:
@@ -126,13 +125,59 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1048431458388444575}
   m_GameObject: {fileID: 1048431458388444575}
   m_CullTransparentMesh: 1
   m_CullTransparentMesh: 1
---- !u!114 &6455316414502444682
+--- !u!1 &1086269673969277074
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 197690018790557001}
+  - component: {fileID: 5118152765236176872}
+  - component: {fileID: 6227241654877716547}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_Select
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &197690018790557001
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1086269673969277074}
+  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: 254, y: -537.9}
+  m_SizeDelta: {x: 141, y: 175}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5118152765236176872
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1086269673969277074}
+  m_CullTransparentMesh: 1
+--- !u!114 &6227241654877716547
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1048431458388444575}
+  m_GameObject: {fileID: 1086269673969277074}
   m_Enabled: 1
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
@@ -156,14 +201,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_fbXuanzhe
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -637,12 +682,100 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_xiadiban
   _icon_name: dec_xiadiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &1691432800552670504
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6136655831423186836}
+  - component: {fileID: 4755960994092275630}
+  - component: {fileID: 7635484185468045460}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon_FaBaoIcon (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6136655831423186836
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1691432800552670504}
+  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: 6108060668469187376}
+  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: -272, y: 197.92}
+  m_SizeDelta: {x: 164.0966, y: 204.2354}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4755960994092275630
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1691432800552670504}
+  m_CullTransparentMesh: 1
+--- !u!114 &7635484185468045460
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1691432800552670504}
+  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: 1
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_fbDiban
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
+  packInfo:
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -679,12 +812,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 5257805513656512840}
   - {fileID: 5257805513656512840}
-  m_Father: {fileID: 4776823611480169892}
+  m_Father: {fileID: 2305457027140451751}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -266.9, y: -47}
-  m_SizeDelta: {x: 108.3078, y: 41.2269}
+  m_AnchoredPosition: {x: 5.8, y: -104.8}
+  m_SizeDelta: {x: 121, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8301238032392716921
 --- !u!222 &8301238032392716921
 CanvasRenderer:
 CanvasRenderer:
@@ -707,7 +840,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.2627451, g: 0.8117648, b: 0.48627454, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -724,14 +857,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: btn_23
+  _icon_name: dec_fbZhuangbeiDiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 8924b78c393d2a2d8f9dd44d02a397a9
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -794,6 +927,7 @@ GameObject:
   - component: {fileID: 5257805513656512840}
   - component: {fileID: 5257805513656512840}
   - component: {fileID: 3901820814049949018}
   - component: {fileID: 3901820814049949018}
   - component: {fileID: 9077695253424898362}
   - component: {fileID: 9077695253424898362}
+  - component: {fileID: 3360249867863613287}
   m_Layer: 0
   m_Layer: 0
   m_HasEditorInfo: 1
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
   m_Name: Text (Legacy)
@@ -818,8 +952,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -1.785, y: 1.785}
+  m_SizeDelta: {x: -3.5701, y: -3.57}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3901820814049949018
 --- !u!222 &3901820814049949018
 CanvasRenderer:
 CanvasRenderer:
@@ -842,7 +976,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 1}
+  m_Color: {r: 0.9960785, g: 0.9960785, b: 0.9960785, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -850,9 +984,9 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 16
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 18
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 10
     m_MinSize: 10
     m_MaxSize: 40
     m_MaxSize: 40
@@ -863,6 +997,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
     m_LineSpacing: 1
   m_Text: "\u88C5\u5907\u4E2D"
   m_Text: "\u88C5\u5907\u4E2D"
+--- !u!114 &3360249867863613287
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2471604515071345865}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.6862745, g: 0.6117647, b: 0.57254905, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &2539860516855989072
 --- !u!1 &2539860516855989072
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1175,7 +1324,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.17254902, g: 0.30980393, b: 0.4784314, a: 1}
+  m_Color: {r: 0.10196079, g: 0.8431373, b: 0.25490198, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1184,10 +1333,10 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 34
-    m_FontStyle: 0
+    m_FontSize: 36
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_MaxSize: 40
     m_Alignment: 3
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
@@ -1519,7 +1668,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
-  m_AnchoredPosition: {x: 226, y: 270}
+  m_AnchoredPosition: {x: 218.1, y: 270}
   m_SizeDelta: {x: 0, y: 60.0699}
   m_SizeDelta: {x: 0, y: 60.0699}
   m_Pivot: {x: 0, y: 0.5}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!222 &6752312888180738513
 --- !u!222 &6752312888180738513
@@ -1607,8 +1756,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 84.1452, y: -16.0794}
-  m_SizeDelta: {x: 532.5146, y: 371.3029}
+  m_AnchoredPosition: {x: 84.1452, y: -12.9789}
+  m_SizeDelta: {x: 532.5146, y: 385.2607}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8915730683377899395
 --- !u!222 &8915730683377899395
 CanvasRenderer:
 CanvasRenderer:
@@ -1678,6 +1827,53 @@ MonoBehaviour:
   m_OnValueChanged:
   m_OnValueChanged:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
+--- !u!1 &3372917499358080596
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2305457027140451751}
+  - component: {fileID: 6714714804991343926}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: CurrentFaBaoRoot (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2305457027140451751
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3372917499358080596}
+  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: 2641489887301634299}
+  - {fileID: 4323141330538414364}
+  m_Father: {fileID: 4776823611480169892}
+  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: -266.9, y: 52.896}
+  m_SizeDelta: {x: 142.1363, y: 241.02}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6714714804991343926
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3372917499358080596}
+  m_CullTransparentMesh: 1
 --- !u!1 &3398005791740917807
 --- !u!1 &3398005791740917807
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -1838,12 +2034,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_shengji
   _icon_name: btn_shengji
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -1924,8 +2120,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_ConstrainProportionsScale: 0
   m_Children:
   m_Children:
   - {fileID: 7999646528679349448}
   - {fileID: 7999646528679349448}
-  - {fileID: 2641489887301634299}
-  - {fileID: 4323141330538414364}
+  - {fileID: 2305457027140451751}
   - {fileID: 3817589179843688023}
   - {fileID: 3817589179843688023}
   m_Father: {fileID: 9037135992368401232}
   m_Father: {fileID: 9037135992368401232}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1955,7 +2150,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8000001, g: 0.8000001, b: 0.8000001, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -1963,7 +2158,7 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillMethod: 4
@@ -1972,14 +2167,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_fbxiaDiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2162,8 +2357,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.9722, y: 408.73486}
-  m_SizeDelta: {x: 741.2503, y: 78.1416}
+  m_AnchoredPosition: {x: 0.00071645, y: 408.73486}
+  m_SizeDelta: {x: 750, y: 78.1416}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8870171658625692314
 --- !u!222 &8870171658625692314
 CanvasRenderer:
 CanvasRenderer:
@@ -2186,7 +2381,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.67058825, g: 0.61960787, b: 0.90196085, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -2203,14 +2398,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: 
+  _icon_name: dec_fbBiaotiDIban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 0}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: 
-    packgJsonPath: 
-    packgSpritePath: 
-    lasetJsonGUID: 
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2250,8 +2445,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 49.6, y: -0.00000047683716}
-  m_SizeDelta: {x: 43.718002, y: 29.1454}
+  m_AnchoredPosition: {x: 48.436, y: -0.00000047683716}
+  m_SizeDelta: {x: 29, y: 25}
   m_Pivot: {x: 1, y: 0.5}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &3468851460439904999
 --- !u!222 &3468851460439904999
 CanvasRenderer:
 CanvasRenderer:
@@ -2291,14 +2486,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_tisheng
+  _icon_name: dec_fbjia
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 48eeb3c8a9b4122a73f0a85aab21a52f
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2471,6 +2666,7 @@ RectTransform:
   - {fileID: 5788500819222458158}
   - {fileID: 5788500819222458158}
   - {fileID: 8695863786727674304}
   - {fileID: 8695863786727674304}
   - {fileID: 3562230635030506916}
   - {fileID: 3562230635030506916}
+  - {fileID: 6136655831423186836}
   - {fileID: 7897417943919571100}
   - {fileID: 7897417943919571100}
   m_Father: {fileID: 3478042439320372479}
   m_Father: {fileID: 3478042439320372479}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2524,8 +2720,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 101.27, y: -268.95367}
-  m_SizeDelta: {x: 516.33, y: 402.5828}
+  m_AnchoredPosition: {x: 101.26, y: -268.95367}
+  m_SizeDelta: {x: 516.33, y: 417}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6680631196129598971
 --- !u!222 &6680631196129598971
 CanvasRenderer:
 CanvasRenderer:
@@ -2542,7 +2738,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5305674097407371432}
   m_GameObject: {fileID: 5305674097407371432}
-  m_Enabled: 0
+  m_Enabled: 1
   m_EditorHideFlags: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
   m_Name: 
@@ -2556,7 +2752,7 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_Sprite: {fileID: 0}
   m_Sprite: {fileID: 0}
-  m_Type: 0
+  m_Type: 1
   m_PreserveAspect: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillCenter: 1
   m_FillMethod: 4
   m_FillMethod: 4
@@ -2565,14 +2761,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_zhongdiban
+  _icon_name: dec_fbzhongDiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2612,8 +2808,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -276, y: 212}
-  m_SizeDelta: {x: 134.9614, y: 134.8815}
+  m_AnchoredPosition: {x: -272, y: 207.7}
+  m_SizeDelta: {x: 110, y: 120}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7714047007213359072
 --- !u!222 &7714047007213359072
 CanvasRenderer:
 CanvasRenderer:
@@ -2653,14 +2849,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_skill_30001
+  _icon_name: icon_fb3301
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   CurrSpriteAtlas: {fileID: 100100200, guid: df05f928400d848c387e627e40486378, type: 3}
   packInfo:
   packInfo:
     packName: skillIcon
     packName: skillIcon
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgJsonPath: /Art/UIAssets/TextrueJson/skillIcon.txt
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
     packgSpritePath: Assets/Res/UIAtlas/skillIcon.spriteatlasv2
-    lasetJsonGUID: 151dde130cdc5228de9614f608886409
+    lasetJsonGUID: 7fb091d8ea8692b1350a9fd8f408874a
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2776,8 +2972,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 8.5783, y: 67.9}
-  m_SizeDelta: {x: 488.9567, y: 38.3}
+  m_AnchoredPosition: {x: 13.686, y: 81.2}
+  m_SizeDelta: {x: 488.9567, y: 51.4679}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &9160311939306131453
 --- !u!222 &9160311939306131453
 CanvasRenderer:
 CanvasRenderer:
@@ -2809,11 +3005,11 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 30
+    m_FontSize: 42
     m_FontStyle: 1
     m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
-    m_MaxSize: 40
+    m_MaxSize: 42
     m_Alignment: 0
     m_Alignment: 0
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
     m_RichText: 1
     m_RichText: 1
@@ -2856,8 +3052,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMin: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
   m_AnchorMax: {x: 1, y: 0.5}
-  m_AnchoredPosition: {x: 48.9, y: 0}
-  m_SizeDelta: {x: 43.718002, y: 29.1454}
+  m_AnchoredPosition: {x: 42.2, y: 2.2}
+  m_SizeDelta: {x: 29, y: 25}
   m_Pivot: {x: 1, y: 0.5}
   m_Pivot: {x: 1, y: 0.5}
 --- !u!222 &7033991628261087965
 --- !u!222 &7033991628261087965
 CanvasRenderer:
 CanvasRenderer:
@@ -2897,14 +3093,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_tisheng
+  _icon_name: dec_fbjia
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 9ca71fa8b53209e4fbac2f9d8f60ce30, type: 3}
   packInfo:
   packInfo:
-    packName: tongyong
-    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
-    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
-    lasetJsonGUID: 48eeb3c8a9b4122a73f0a85aab21a52f
+    packName: fabao
+    packgJsonPath: /Art/UIAssets/TextrueJson\fabao.txt
+    packgSpritePath: Assets/Res/UIAtlas/fabao.spriteatlasv2
+    lasetJsonGUID: 3dd43d8a4094ef4ef1bab558df91180e
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3056,7 +3252,7 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Material: {fileID: 0}
-  m_Color: {r: 0.17254902, g: 0.30980393, b: 0.4784314, a: 1}
+  m_Color: {r: 0.101960786, g: 0.84313726, b: 0.25490198, a: 1}
   m_RaycastTarget: 1
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_Maskable: 1
@@ -3064,11 +3260,11 @@ MonoBehaviour:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 34
-    m_FontStyle: 0
+    m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
+    m_FontSize: 32
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 3
     m_MaxSize: 40
     m_MaxSize: 40
     m_Alignment: 3
     m_Alignment: 3
     m_AlignByGeometry: 0
     m_AlignByGeometry: 0
@@ -3114,8 +3310,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 21.444, y: 37}
-  m_SizeDelta: {x: 507.0453, y: 200}
+  m_AnchoredPosition: {x: 4.8672, y: -24.7863}
+  m_SizeDelta: {x: 473.8917, y: 323.5725}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2646367918689829722
 --- !u!222 &2646367918689829722
 CanvasRenderer:
 CanvasRenderer:
@@ -3265,12 +3461,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_shengji
   _icon_name: btn_shengji
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -3354,8 +3550,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 8.5783, y: -17.7}
-  m_SizeDelta: {x: 488.9567, y: 129.4209}
+  m_AnchoredPosition: {x: 4.3, y: -23.6509}
+  m_SizeDelta: {x: 464.8343, y: 153.9226}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8091370797186559976
 --- !u!222 &8091370797186559976
 CanvasRenderer:
 CanvasRenderer:
@@ -3387,8 +3583,8 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 26
-    m_FontStyle: 0
+    m_FontSize: 28
+    m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
     m_MaxSize: 40
     m_MaxSize: 40
@@ -3467,7 +3663,7 @@ MonoBehaviour:
       m_Calls: []
       m_Calls: []
   m_FontData:
   m_FontData:
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
     m_Font: {fileID: 12800000, guid: e588d93665211944387ec8c03c8726ae, type: 3}
-    m_FontSize: 41
+    m_FontSize: 42
     m_FontStyle: 1
     m_FontStyle: 1
     m_BestFit: 0
     m_BestFit: 0
     m_MinSize: 1
     m_MinSize: 1
@@ -3828,12 +4024,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_lingwu
   _icon_name: btn_lingwu
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -4008,6 +4204,7 @@ RectTransform:
   - {fileID: 3478042439320372479}
   - {fileID: 3478042439320372479}
   - {fileID: 4776823611480169892}
   - {fileID: 4776823611480169892}
   - {fileID: 696920691199857773}
   - {fileID: 696920691199857773}
+  - {fileID: 197690018790557001}
   m_Father: {fileID: 0}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -4163,6 +4360,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isAssetBundle: 0
     isList: 0
     isList: 0
     ListCollectorDatas: []
     ListCollectorDatas: []
+  - key: Icon_Select
+    gameObject: {fileID: 6227241654877716547}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 0
   isAssetBundle: 0
 --- !u!1 &9056821549282551153
 --- !u!1 &9056821549282551153
 GameObject:
 GameObject:
@@ -4244,12 +4446,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_lingwu
   _icon_name: btn_lingwu
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

+ 5 - 5
Assets/Res/UI/SkillSelectPanel/Btn_UpStar.prefab

@@ -170,12 +170,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: btn_lingwu
   _icon_name: btn_lingwu
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

+ 10 - 10
Assets/Res/UI/SkillSelectPanel/GongFaUpgradeInfoWidget.prefab

@@ -525,12 +525,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_tiaomulandiban
   _icon_name: dec_tiaomulandiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -791,12 +791,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_tiaomulandiban
   _icon_name: dec_tiaomulandiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: 1fc57c8d04bebfe9417e3e2522efd20c
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

+ 10 - 10
Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab

@@ -2481,12 +2481,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_tiaomulandiban
   _icon_name: dec_tiaomulandiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
@@ -2931,12 +2931,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   m_PixelsPerUnitMultiplier: 1
   _icon_name: dec_xiadiban
   _icon_name: dec_xiadiban
   isNotLoadDeftIcon: 0
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: 6f6d3dad490d22d3028cfa941e8122a5
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: d4e5a262b3976e33870ab7190f3a5bdb
   useGradient: 0
   useGradient: 0
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}

+ 8 - 0
Assets/Res/UI/Task.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Wn0Y4CP5US4su6thD1uITpNBo2Vi4oC37V9t+vCvWwe+1ZKFhB511VEWAfZB
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 966 - 0
Assets/Res/UI/Task/TaskInfoPanel.prefab

@@ -0,0 +1,966 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &650584255987892480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8599819629026832582}
+  - component: {fileID: 7897761964867798499}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: TaskInfoPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8599819629026832582
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  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: 2896655462721008753}
+  - {fileID: 2569128129379278262}
+  - {fileID: 4688522053669353716}
+  - {fileID: 8515100903656146540}
+  - {fileID: 3203492498983292032}
+  - {fileID: 3220702368838562604}
+  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 &7897761964867798499
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 650584255987892480}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: bg
+    gameObject: {fileID: 8488195482551738332}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Close
+    gameObject: {fileID: 3651346582420827263}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Btn_Ok
+    gameObject: {fileID: 3169074378938001994}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Name
+    gameObject: {fileID: 9048041755528718903}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_desc
+    gameObject: {fileID: 1040938809657299556}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: Text_Title
+    gameObject: {fileID: 1087322108478024986}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: ItemRoot
+    gameObject: {fileID: 708683880219238892}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!1 &1408015899473625068
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 708683880219238892}
+  - component: {fileID: 4283077157061789222}
+  - component: {fileID: 4881049144302649175}
+  - component: {fileID: 5435399637829414925}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: ItemRoot
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &708683880219238892
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1408015899473625068}
+  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: 4038523271141183626}
+  m_Father: {fileID: 3220702368838562604}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: -287.1}
+  m_SizeDelta: {x: 410.77, y: 248.4609}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &4283077157061789222
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1408015899473625068}
+  m_CullTransparentMesh: 1
+--- !u!114 &4881049144302649175
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1408015899473625068}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 1
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 100, y: 100}
+  m_Spacing: {x: 2.8, y: 0}
+  m_Constraint: 1
+  m_ConstraintCount: 4
+--- !u!114 &5435399637829414925
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1408015899473625068}
+  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 &2132268725135064903
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2569128129379278262}
+  - component: {fileID: 9156533754913033698}
+  - component: {fileID: 8488195482551738332}
+  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 &2569128129379278262
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  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: 8599819629026832582}
+  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: 46.5656}
+  m_SizeDelta: {x: 475.8763, y: 777.9515}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9156533754913033698
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  m_CullTransparentMesh: 1
+--- !u!114 &8488195482551738332
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2132268725135064903}
+  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: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_dadi_01
+  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: 4ebd7d8d5739e3c27ba90d2ae88ba1cc
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!1 &2553589566839113697
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4688522053669353716}
+  - component: {fileID: 2934276402299459566}
+  - component: {fileID: 2433990691951363383}
+  - component: {fileID: 3169074378938001994}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Btn_Ok
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &4688522053669353716
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  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: 6150498200931894423}
+  m_Father: {fileID: 8599819629026832582}
+  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: -9, y: -288.69}
+  m_SizeDelta: {x: 132.3538, y: 50.3799}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2934276402299459566
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  m_CullTransparentMesh: 1
+--- !u!114 &2433990691951363383
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  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.27792454, g: 1, b: 0, 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: btn_23
+  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: 
+  useGradient: 0
+  topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
+  bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
+  direction: 0
+--- !u!114 &3169074378938001994
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2553589566839113697}
+  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: 2433990691951363383}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &3552915526930824737
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6150498200931894423}
+  - component: {fileID: 2944092694878402809}
+  - component: {fileID: 2519922024915380815}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text (Legacy) (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6150498200931894423
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  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: 4688522053669353716}
+  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 &2944092694878402809
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  m_CullTransparentMesh: 1
+--- !u!114 &2519922024915380815
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3552915526930824737}
+  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.19607843, g: 0.19607843, b: 0.19607843, 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: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_FontSize: 21
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 10
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u6311\u6218"
+--- !u!1 &3627747089450203247
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3220702368838562604}
+  - component: {fileID: 9047568930966635103}
+  - component: {fileID: 1040938809657299556}
+  - component: {fileID: 2900250309646589645}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_desc
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3220702368838562604
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627747089450203247}
+  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: 708683880219238892}
+  m_Father: {fileID: 8599819629026832582}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: -506}
+  m_SizeDelta: {x: 410.77, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &9047568930966635103
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627747089450203247}
+  m_CullTransparentMesh: 1
+--- !u!114 &1040938809657299556
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627747089450203247}
+  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.19607843, g: 0.19607843, b: 0.19607843, 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: 26
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u5317\u6D77\u9065\u8FDC\uFF0C\u5C71\u9AD8\u8DEF\u9669\uFF0C\u6211\u5982\u4ECA\u53EA\u6709\u7EC3\u6C14\u4FEE\u4E3A\uFF0C\u4F55\u65F6\u80FD\u5230\uFF1F\u5F97\u4E00\u8FB9\u4FEE\u70BC\u4E00\u8FB9\u627E\u8DEF\u3002"
+--- !u!114 &2900250309646589645
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3627747089450203247}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
+--- !u!1 &5056397833504547694
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3203492498983292032}
+  - component: {fileID: 7191667401234808033}
+  - component: {fileID: 9048041755528718903}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Name
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3203492498983292032
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5056397833504547694}
+  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: 8599819629026832582}
+  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: -121.43, y: 339.6}
+  m_SizeDelta: {x: 167.8958, y: 40.0044}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7191667401234808033
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5056397833504547694}
+  m_CullTransparentMesh: 1
+--- !u!114 &9048041755528718903
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5056397833504547694}
+  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.19607843, g: 0.19607843, b: 0.19607843, 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: 26
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 3
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4EFB\u52A1\u4FE1\u606F"
+--- !u!1 &6488653642591306706
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4038523271141183626}
+  - component: {fileID: 1806185420655456625}
+  - component: {fileID: 7636505141800979906}
+  - component: {fileID: 8034690176435114309}
+  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 &4038523271141183626
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6488653642591306706}
+  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: 708683880219238892}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 50.8, y: -23.6}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1806185420655456625
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6488653642591306706}
+  m_CullTransparentMesh: 1
+--- !u!114 &7636505141800979906
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6488653642591306706}
+  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.19607843, g: 0.19607843, b: 0.19607843, 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: 20
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 0
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4EFB\u52A1\u5956\u52B1\uFF1A"
+--- !u!114 &8034690176435114309
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6488653642591306706}
+  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 &6864546897549033815
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2896655462721008753}
+  - component: {fileID: 1550575800954493607}
+  - component: {fileID: 8853780473327312120}
+  - component: {fileID: 3651346582420827263}
+  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 &2896655462721008753
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  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: 8599819629026832582}
+  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 &1550575800954493607
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_CullTransparentMesh: 1
+--- !u!114 &8853780473327312120
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.69411767}
+  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 &3651346582420827263
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6864546897549033815}
+  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: 8853780473327312120}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &8794085188831228050
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8515100903656146540}
+  - component: {fileID: 126500885704442088}
+  - component: {fileID: 1087322108478024986}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Text_Title
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8515100903656146540
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8794085188831228050}
+  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: 8599819629026832582}
+  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.0000038147, y: 380}
+  m_SizeDelta: {x: 410.7655, y: 55.7865}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &126500885704442088
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8794085188831228050}
+  m_CullTransparentMesh: 1
+--- !u!114 &1087322108478024986
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8794085188831228050}
+  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.19607843, g: 0.19607843, b: 0.19607843, 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: 30
+    m_FontStyle: 1
+    m_BestFit: 0
+    m_MinSize: 2
+    m_MaxSize: 40
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u4EFB\u52A1\u4FE1\u606F"

+ 7 - 0
Assets/Res/UI/Task/TaskInfoPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WXMf4CKrAi7hr08s4Yu3r4QyKNW2jUJNzv4sb7Z5Oz+GdeYwA/YO0mqwRimf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/WidgetItem.prefab

@@ -356,7 +356,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 80, y: 80}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &5132790119407906693
 --- !u!114 &5132790119407906693
 MonoBehaviour:
 MonoBehaviour:

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

@@ -0,0 +1,29 @@
+%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: 3865dafca958c0940b74e993b5f46ad1, type: 3}
+    - {fileID: 2800000, guid: 9eb73cf6fee9ba74aa5d6df6e3eb3b17, type: 3}
+    - {fileID: 2800000, guid: 165add3f4e3f9fc4d8906d8c04a6a2ed, type: 3}
+    - {fileID: 2800000, guid: 5dfd3f252e28f4149a0f42859beb5cee, type: 3}
+    - {fileID: 2800000, guid: 1fb1ab4512e51ef4ebbbc8488672a046, type: 3}
+    - {fileID: 2800000, guid: 39e67433d3c3202468ac0bc867db89c8, type: 3}
+    - {fileID: 2800000, guid: 7e7319d9a91d402408b8fd9783d34ee3, type: 3}
+    - {fileID: 2800000, guid: ab958317925887b44adfeed1c3d17c69, type: 3}
+    - {fileID: 2800000, guid: 8299e633393d9344db1401749196c005, type: 3}
+    - {fileID: 2800000, guid: 2b1f1b75cddb73e41a762a8ce1c2346e, type: 3}
+    - {fileID: 2800000, guid: 5acf5a39d08135d4da4abac656bfabc8, type: 3}
+    - {fileID: 2800000, guid: b9734d55b2510ef47b701222e7a96be8, type: 3}
+    - {fileID: 2800000, guid: 2dff6d61523a234458e80503fabd0388, type: 3}
+    - {fileID: 2800000, guid: ddfae4554bb0298498d30493b4ec21ac, type: 3}
+  m_IsVariant: 0
+  m_IsPlaceholder: 0

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

@@ -0,0 +1,31 @@
+fileFormatVersion: 2
+guid: BilOsiv7AnPL9pfXZVK1i5+hW/mt83IgAfL4JY8aw5UsxXNWYxWeXq4NcJ0F
+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: 
+  assetBundleVariant: 

+ 0 - 4
Assets/Res/UIAtlas/gongfa.spriteatlasv2

@@ -11,8 +11,6 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
   m_ImporterData:
     packables:
     packables:
-    - {fileID: 2800000, guid: 9a900330dc689094f8567dfbac18f61a, type: 3}
-    - {fileID: 2800000, guid: 8ea63d948b4761f4d959380d2c15b004, type: 3}
     - {fileID: 2800000, guid: fb00faac5d5651a448d9318437472d9b, type: 3}
     - {fileID: 2800000, guid: fb00faac5d5651a448d9318437472d9b, type: 3}
     - {fileID: 2800000, guid: fe4b311cfd2d91341951749b21feaa39, type: 3}
     - {fileID: 2800000, guid: fe4b311cfd2d91341951749b21feaa39, type: 3}
     - {fileID: 2800000, guid: 2d108f29fea8b454fb4bfb050da2bec4, type: 3}
     - {fileID: 2800000, guid: 2d108f29fea8b454fb4bfb050da2bec4, type: 3}
@@ -27,10 +25,8 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: eca526fb63a44b34e842b64ef53d3f42, type: 3}
     - {fileID: 2800000, guid: eca526fb63a44b34e842b64ef53d3f42, type: 3}
     - {fileID: 2800000, guid: 52f98dc1c08412c47b031b11d5f3c92b, type: 3}
     - {fileID: 2800000, guid: 52f98dc1c08412c47b031b11d5f3c92b, type: 3}
     - {fileID: 2800000, guid: 5a02bbdeed7d4c24a869162ba8a43756, type: 3}
     - {fileID: 2800000, guid: 5a02bbdeed7d4c24a869162ba8a43756, type: 3}
-    - {fileID: 2800000, guid: ba86d5d3161dba94aaeff92ff7e57d15, type: 3}
     - {fileID: 2800000, guid: 1c9cbf3bcd6bf2747b4302e616928bea, type: 3}
     - {fileID: 2800000, guid: 1c9cbf3bcd6bf2747b4302e616928bea, type: 3}
     - {fileID: 2800000, guid: 6607462b8d1a684468a38176cc3b5d19, type: 3}
     - {fileID: 2800000, guid: 6607462b8d1a684468a38176cc3b5d19, type: 3}
-    - {fileID: 2800000, guid: 9bfe4fd79eb566f4ea8a19c63dd1f5ec, type: 3}
     - {fileID: 2800000, guid: 26b9c815f60b040449bd1193a2239b56, type: 3}
     - {fileID: 2800000, guid: 26b9c815f60b040449bd1193a2239b56, type: 3}
     - {fileID: 2800000, guid: 6915812c09980c247b3299784faddfae, type: 3}
     - {fileID: 2800000, guid: 6915812c09980c247b3299784faddfae, type: 3}
   m_IsVariant: 0
   m_IsVariant: 0

+ 6 - 0
Assets/Res/UIAtlas/skillIcon.spriteatlasv2

@@ -12,6 +12,12 @@ SpriteAtlasAsset:
   m_ImporterData:
   m_ImporterData:
     packables:
     packables:
     - {fileID: 2800000, guid: 302885b2bf553a344bebd1252874a8c6, type: 3}
     - {fileID: 2800000, guid: 302885b2bf553a344bebd1252874a8c6, type: 3}
+    - {fileID: 2800000, guid: 5c5604f96bee902469a11493fa4de847, type: 3}
+    - {fileID: 2800000, guid: 6020cec41ffd6b048a2c10cc50a0a10a, type: 3}
+    - {fileID: 2800000, guid: b94deddc4eb67234ca711be8a28cdbca, type: 3}
+    - {fileID: 2800000, guid: 1c98eee60d465284e99cfb55dd76c523, type: 3}
+    - {fileID: 2800000, guid: 5afc18f94b5b5224c96f6ebb684acb85, type: 3}
+    - {fileID: 2800000, guid: 7bd46099997efbf43a82964054890193, type: 3}
     - {fileID: 2800000, guid: 3d2f60e67d2fb334daf5a7480e187e21, type: 3}
     - {fileID: 2800000, guid: 3d2f60e67d2fb334daf5a7480e187e21, type: 3}
     - {fileID: 2800000, guid: 2e532783597d5a04ba33e19ef556c6e2, type: 3}
     - {fileID: 2800000, guid: 2e532783597d5a04ba33e19ef556c6e2, type: 3}
     - {fileID: 2800000, guid: 90794c0dac34c4c45aafc79e906844ab, type: 3}
     - {fileID: 2800000, guid: 90794c0dac34c4c45aafc79e906844ab, type: 3}

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

@@ -26,6 +26,9 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 760b972dae738db4d8b5ccb1d57dc843, type: 3}
     - {fileID: 2800000, guid: 760b972dae738db4d8b5ccb1d57dc843, type: 3}
     - {fileID: 2800000, guid: eedabc15aae7104408edf7c471b5f6a7, type: 3}
     - {fileID: 2800000, guid: eedabc15aae7104408edf7c471b5f6a7, type: 3}
     - {fileID: 2800000, guid: 0bcd03373dfdc234bb832ef5e8e3177b, type: 3}
     - {fileID: 2800000, guid: 0bcd03373dfdc234bb832ef5e8e3177b, type: 3}
+    - {fileID: 2800000, guid: 9a900330dc689094f8567dfbac18f61a, type: 3}
+    - {fileID: 2800000, guid: 58acd5bd1d8ea2448b0b4a001b241419, type: 3}
+    - {fileID: 2800000, guid: 8ea63d948b4761f4d959380d2c15b004, type: 3}
     - {fileID: 2800000, guid: 2990c1d0f0e731548b201bcf744187da, type: 3}
     - {fileID: 2800000, guid: 2990c1d0f0e731548b201bcf744187da, type: 3}
     - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
     - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
     - {fileID: 2800000, guid: 25ea5a471ccb19146804285a8e6916ed, type: 3}
     - {fileID: 2800000, guid: 25ea5a471ccb19146804285a8e6916ed, type: 3}
@@ -59,7 +62,9 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 656e38c697e9792479fe634f5f8bea8d, type: 3}
     - {fileID: 2800000, guid: 656e38c697e9792479fe634f5f8bea8d, type: 3}
     - {fileID: 2800000, guid: 6a4ae9d9bf667354a8611accc71f8d50, type: 3}
     - {fileID: 2800000, guid: 6a4ae9d9bf667354a8611accc71f8d50, type: 3}
     - {fileID: 2800000, guid: 2b4c4eb9c47d81945a3315fb99ac6de1, type: 3}
     - {fileID: 2800000, guid: 2b4c4eb9c47d81945a3315fb99ac6de1, type: 3}
+    - {fileID: 2800000, guid: ba86d5d3161dba94aaeff92ff7e57d15, type: 3}
     - {fileID: 2800000, guid: b8390464696c712499e852112d209bce, type: 3}
     - {fileID: 2800000, guid: b8390464696c712499e852112d209bce, type: 3}
+    - {fileID: 2800000, guid: 9bfe4fd79eb566f4ea8a19c63dd1f5ec, type: 3}
     - {fileID: 2800000, guid: 939cf700d9f1e0344914a17bda374b4a, type: 3}
     - {fileID: 2800000, guid: 939cf700d9f1e0344914a17bda374b4a, type: 3}
     - {fileID: 2800000, guid: 9c0b0fd4eb2445f4cabe4b5febe52f66, type: 3}
     - {fileID: 2800000, guid: 9c0b0fd4eb2445f4cabe4b5febe52f66, type: 3}
     - {fileID: 2800000, guid: 416044e3ca43d5d47adb73e0b3c82e5e, type: 3}
     - {fileID: 2800000, guid: 416044e3ca43d5d47adb73e0b3c82e5e, type: 3}

+ 15 - 7
Assets/Scenes/testCombat.scene

@@ -2196,9 +2196,17 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       value: 0
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: isZhanZhuang
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
+      propertyPath: zhanZhuangTime
+      value: 60
+      objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].hp
       propertyPath: myHeroInfo.Array.data[0].hp
-      value: 46090
+      value: 43373
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].mu
       propertyPath: myHeroInfo.Array.data[0].mu
@@ -2210,11 +2218,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].att
       propertyPath: myHeroInfo.Array.data[0].att
-      value: 1713
+      value: 1353
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].def
       propertyPath: myHeroInfo.Array.data[0].def
-      value: 933
+      value: 708
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].huo
       propertyPath: myHeroInfo.Array.data[0].huo
@@ -2234,7 +2242,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].level
       propertyPath: myHeroInfo.Array.data[0].level
-      value: 120
+      value: 150
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].att
       propertyPath: enemyHeroInfo.Array.data[0].att
@@ -2242,7 +2250,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].level
       propertyPath: enemyHeroInfo.Array.data[0].level
-      value: 120
+      value: 150
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: enemyHeroInfo.Array.data[0].heroID
       propertyPath: enemyHeroInfo.Array.data[0].heroID
@@ -2250,11 +2258,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillLevel
       propertyPath: myHeroInfo.Array.data[0].skillLevel
-      value: 23
+      value: 30
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skillStart
       propertyPath: myHeroInfo.Array.data[0].skillStart
-      value: 3
+      value: 4
       objectReference: {fileID: 0}
       objectReference: {fileID: 0}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
     - target: {fileID: 6090200664286961698, guid: 1076536f8fdf47942aa287592c6a8b19, type: 3}
       propertyPath: myHeroInfo.Array.data[0].skill.Array.size
       propertyPath: myHeroInfo.Array.data[0].skill.Array.size

+ 9 - 2
Assets/Scripts/Core/BattleReport/BattleReportValueDataModule.cs

@@ -12,7 +12,7 @@ namespace Core.BattleReport
         public Dictionary<string, ReportFightValueData<float>> fightValueData_long =
         public Dictionary<string, ReportFightValueData<float>> fightValueData_long =
             new Dictionary<string, ReportFightValueData<float>>();
             new Dictionary<string, ReportFightValueData<float>>();
 
 
-        public void SetMax(string name, float value)
+        public void SetMax(string name, float value, bool isAdd = false)
         {
         {
             if (!fightValueData_long.ContainsKey(name))
             if (!fightValueData_long.ContainsKey(name))
             {
             {
@@ -25,7 +25,14 @@ namespace Core.BattleReport
             }
             }
             else
             else
             {
             {
-                fightValueData_long[name].maxValue = value;
+                if (isAdd)
+                {
+                    fightValueData_long[name].maxValue += value;
+                }
+                else
+                {
+                    fightValueData_long[name].maxValue = value;
+                }
             }
             }
         }
         }
 
 

+ 13 - 1
Assets/Scripts/Core/Event/Event/CustomEventType.cs

@@ -94,7 +94,19 @@ namespace Fort23.Core
       /// </summary>
       /// </summary>
       RefenceBreakthrough,
       RefenceBreakthrough,
       ShengShiOnClick,
       ShengShiOnClick,
-      ShopRefence
+      ShopRefence,
+      /// <summary>
+      /// 任务刷新
+      /// </summary>
+      TaskUpdate,
+      /// <summary>
+      /// 境界升级
+      /// </summary>
+      JingJieUpgrade,
+      /// <summary>
+      /// 刷新随机事件
+      /// </summary>
+      DetectRandomEvent
       
       
     }
     }
 }
 }

+ 8 - 2
Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -23,11 +23,11 @@ public int ID;
 		/// <summary>
 		/// <summary>
 		///事件的起始ID
 		///事件的起始ID
 		/// </summary>
 		/// </summary>
-public int EventBeginId;
+public int[] EventLinksId;
 
 
 
 
 		/// <summary>
 		/// <summary>
-		///触发事件类型: 1.通用事件 2.挂机事件 3.地图专用事件
+		///触发事件类型: 1.通用事件 2.挂机事件 3.地图专用事件 4.主线任务
 		/// </summary>
 		/// </summary>
 public int EventTriggerType;
 public int EventTriggerType;
 
 
@@ -59,6 +59,12 @@ public int[] EventVlaue;
 		/// <summary>
 		/// <summary>
 		///描述(题目)
 		///描述(题目)
 		/// </summary>
 		/// </summary>
+public int EventName;
+
+
+		/// <summary>
+		///
+		/// </summary>
 public int Description;
 public int Description;
 
 
 
 

+ 25 - 7
Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs → Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -1,18 +1,18 @@
 // Auto Generated Code By excel2json
 // Auto Generated Code By excel2json
-// Generate From Excel\EventConfig.xlsx. SheetName: EventConditionConfig
+// Generate From Excel\EventConfig.xlsx. SheetName: EventLinkConfig
 
 
 using System;
 using System;
 using Fort23.GameData;
 using Fort23.GameData;
 
 
 namespace Excel2Json
 namespace Excel2Json
 {
 {
-	[Config(prefab = "EventConditionConfig.json")]
-	public partial class EventConditionConfigHolder : ConfigHolder<EventConditionConfig>
	{
+	[Config(prefab = "EventLinkConfig.json")]
+	public partial class EventLinkConfigHolder : ConfigHolder<EventLinkConfig>
	{
 	}
 	}
 
 
 
 
 	[Serializable]
 	[Serializable]
-	public struct EventConditionConfig : IConfig
	{
+	public struct EventLinkConfig : IConfig
	{
 		public int GetID() {return ID;} 
 		public int GetID() {return ID;} 
 		/// <summary>
 		/// <summary>
 		///条件ID
 		///条件ID
@@ -20,6 +20,12 @@ namespace Excel2Json
 public int ID;
 public int ID;
 
 
 
 
+		/// <summary>
+		///事件描述
+		/// </summary>
+public int conciseEventMessage;
+
+
 		/// <summary>
 		/// <summary>
 		///文本语言表ID
 		///文本语言表ID
 		/// </summary>
 		/// </summary>
@@ -39,13 +45,19 @@ public int[] ConditionPara;
 
 
 
 
 		/// <summary>
 		/// <summary>
-		///事件类型 1=提供选项 2=进入战斗 3=获得奖励
+		///条件完成次数
+		/// </summary>
+public int finishCount;
+
+
+		/// <summary>
+		///事件类型 1=提供选项 2=进入战斗 3=获得奖励 4=触发下一个事件
 		/// </summary>
 		/// </summary>
 public int optionType;
 public int optionType;
 
 
 
 
 		/// <summary>
 		/// <summary>
-		///事件常量1 1=事件IDs 2=战斗ID 3=
+		///事件常量1 1=事件IDs 2=战斗ID 3= 4=eventConfigID
 		/// </summary>
 		/// </summary>
 public int[] optionPara1;
 public int[] optionPara1;
 
 
@@ -69,7 +81,13 @@ public int[] PrizeNums;
 
 
 
 
 		/// <summary>
 		/// <summary>
-		///事件结局后提供的选项 战斗:胜利/失败转事件ID
+		///事件结束类型 1:跳转事件 2:根据战斗解锁跳转事件 3.触发新事件
+		/// </summary>
+public int ResultType;
+
+
+		/// <summary>
+		///事件结局后提供的选项 1.EventConditionId 2.胜利id;失败id 3.EventConfigId
 		/// </summary>
 		/// </summary>
 public int[] ResultOptions;
 public int[] ResultOptions;
 
 

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/EventConditionConfig.cs.meta → Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
 fileFormatVersion: 2
-guid: DHMf4H+uAHJlLYrnxIfgX+FkNw/BLu5Y3W+3/ASQGV3v3Sd0X3DNJ76ObE5l
+guid: WStOsyypAS5MRfKzK/6DHE/FZk3Dq9HnM9aos6ET60meZ2f7XZI7hN/wX2Wn
 MonoImporter:
 MonoImporter:
   externalObjects: {}
   externalObjects: {}
   serializedVersion: 2
   serializedVersion: 2

+ 68 - 0
Assets/Scripts/GameData/ExcelConfig/ResourceLevelConfig.cs

@@ -0,0 +1,68 @@
+// Auto Generated Code By excel2json
+// Generate From Excel\ResourceLevel.xlsx. SheetName: ResourceLevelConfig
+
+using System;
+using Fort23.GameData;
+
+namespace Excel2Json
+{
+	[Config(prefab = "ResourceLevelConfig.json")]
+	public partial class ResourceLevelConfigHolder : ConfigHolder<ResourceLevelConfig>
	{
+	}
+
+
+	[Serializable]
+	public struct ResourceLevelConfig : IConfig
	{
+		public int GetID() {return ID;} 
+		/// <summary>
+		///
+		/// </summary>
+public int ID;
+
+
+		/// <summary>
+		///等级
+		/// </summary>
+public int Level;
+
+
+		/// <summary>
+		///1001 铜钱
+		/// </summary>
+public float value1;
+
+
+		/// <summary>
+		///1002 银锭
+		/// </summary>
+public float value2;
+
+
+		/// <summary>
+		///1003 修为
+		/// </summary>
+public float value3;
+
+
+		/// <summary>
+		///1004 金锭
+		/// </summary>
+public float value4;
+
+
+		/// <summary>
+		///1005 功法灵气
+		/// </summary>
+public float value5;
+
+
+		/// <summary>
+		///1006 法宝灵韵
+		/// </summary>
+public float value6;
+
+
+	}
+
+}
+// End of Auto Generated Code

Some files were not shown because too many files changed in this diff