浏览代码

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

lzx 3 周之前
父节点
当前提交
762fa0bf93
共有 51 个文件被更改,包括 3908 次插入252 次删除
  1. 0 1
      Assets/Art/UIAssets/TextrueJson/battle.txt
  2. 0 0
      Assets/Art/UIAssets/TextrueJson/tongyong.txt
  3. 二进制
      Assets/Art/UIAssets/decorate/dec_auto_di.png
  4. 147 0
      Assets/Art/UIAssets/decorate/dec_auto_di.png.meta
  5. 二进制
      Assets/Art/UIAssets/decorate/dec_boss_tx.png
  6. 147 0
      Assets/Art/UIAssets/decorate/dec_boss_tx.png.meta
  7. 二进制
      Assets/Art/UIAssets/decorate/dec_boss_tx_kuang.png
  8. 147 0
      Assets/Art/UIAssets/decorate/dec_boss_tx_kuang.png.meta
  9. 二进制
      Assets/Art/UIAssets/decorate/dec_guaiwu_tx.png
  10. 147 0
      Assets/Art/UIAssets/decorate/dec_guaiwu_tx.png.meta
  11. 二进制
      Assets/Art/UIAssets/decorate/dec_jianbian_di.png
  12. 147 0
      Assets/Art/UIAssets/decorate/dec_jianbian_di.png.meta
  13. 二进制
      Assets/Art/UIAssets/decorate/dec_juxing_miaobian1.png
  14. 147 0
      Assets/Art/UIAssets/decorate/dec_juxing_miaobian1.png.meta
  15. 二进制
      Assets/Art/UIAssets/decorate/dec_juxing_miaobian2.png
  16. 147 0
      Assets/Art/UIAssets/decorate/dec_juxing_miaobian2.png.meta
  17. 二进制
      Assets/Art/UIAssets/decorate/dec_tx.png
  18. 0 56
      Assets/Art/UIAssets/decorate/dec_tx.png.meta
  19. 二进制
      Assets/Art/UIAssets/decorate/dec_tx_di.png
  20. 147 0
      Assets/Art/UIAssets/decorate/dec_tx_di.png.meta
  21. 二进制
      Assets/Art/UIAssets/decorate/dec_tx_kuang.png
  22. 147 0
      Assets/Art/UIAssets/decorate/dec_tx_kuang.png.meta
  23. 二进制
      Assets/Art/UIAssets/decorate/dec_zanting.png
  24. 3 3
      Assets/Res/Config/EventConditionConfig.json
  25. 78 26
      Assets/Res/Config/EventConfig.json
  26. 52 50
      Assets/Res/Config/EventLinkConfig.json
  27. 1772 8
      Assets/Res/Config/LanguageChineseConfig.json
  28. 2 13
      Assets/Res/Config/XianTuLogConfig.json
  29. 648 77
      Assets/Res/UI/CombatPanel.prefab
  30. 7 0
      Assets/Res/UIAtlas/battle.spriteatlasv2
  31. 20 8
      Assets/Scripts/GameData/ExcelConfig/EventConfig.cs
  32. 3 3
      Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs
  33. 0 6
      Assets/Scripts/GameData/ExcelConfig/XianTuLogConfig.cs
  34. 二进制
      Excel2Json/Excel/EventConfig.xlsx
  35. 二进制
      Excel2Json/Excel/Language.xlsx
  36. 二进制
      Excel2Json/Excel/Maps.xlsx
  37. 二进制
      Excel2Json/Excel/修仙游戏数据规划表.xlsx
  38. 0 0
      UGUIPack/uguiconfig.db
  39. 0 1
      美术/unity_use_ui/TextrueJson/battle.txt
  40. 0 0
      美术/unity_use_ui/TextrueJson/tongyong.txt
  41. 二进制
      美术/unity_use_ui/decorate/dec_auto_di.png
  42. 二进制
      美术/unity_use_ui/decorate/dec_boss_tx.png
  43. 二进制
      美术/unity_use_ui/decorate/dec_boss_tx_kuang.png
  44. 二进制
      美术/unity_use_ui/decorate/dec_guaiwu_tx.png
  45. 二进制
      美术/unity_use_ui/decorate/dec_jianbian_di.png
  46. 二进制
      美术/unity_use_ui/decorate/dec_juxing_miaobian1.png
  47. 二进制
      美术/unity_use_ui/decorate/dec_juxing_miaobian2.png
  48. 二进制
      美术/unity_use_ui/decorate/dec_tx.png
  49. 二进制
      美术/unity_use_ui/decorate/dec_tx_di.png
  50. 二进制
      美术/unity_use_ui/decorate/dec_tx_kuang.png
  51. 二进制
      美术/unity_use_ui/decorate/dec_zanting.png

文件差异内容过多而无法显示
+ 0 - 1
Assets/Art/UIAssets/TextrueJson/battle.txt


文件差异内容过多而无法显示
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


二进制
Assets/Art/UIAssets/decorate/dec_auto_di.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_auto_di.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: WigdsCL5VylldF+2/cNT6aBI/H4FjL7qGy4jjHQTRGB6eTedRAfRUSddX5m0
+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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_boss_tx.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_boss_tx.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: W39Lt3j+BSkm0J44wUT5pdxzBJE4GSfHFEeGODcbBDn8uB2cKrz0lJ2tb2/I
+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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_boss_tx_kuang.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_boss_tx_kuang.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: XH8Ytn6kB3K2xGra83S2Uu+MhjzoGYvfv5ANblfpZioqerqGdmOkzsXEWcLd
+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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_guaiwu_tx.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_guaiwu_tx.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: XH1MsX75AClyNOlTqvRNCr/Gs8RMnQHfDSNRVmEUo0NCHorzTYyMv5XL5nSs
+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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_jianbian_di.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_jianbian_di.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: CSlKti38Bi+yLh+0xWvpl95Q66EAjPWWf/roNj4+vZJ2MLTAq7QPtvjpM926
+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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_juxing_miaobian1.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_juxing_miaobian1.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: Cy4X4COuAH9TmD+wR6MwoWkuCGxNFX5bzOLKZSQ6Fx8OSVgwZUtFFwkQwPjD
+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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_juxing_miaobian2.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_juxing_miaobian2.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: B3NM5nz8Wnmf4bSplAuV5mnFGzVDvOA1UlOhsIxjU4SH3yUwkj5rgMiCPOHM
+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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_tx.png


+ 0 - 56
Assets/Art/UIAssets/decorate/dec_tx.png.meta

@@ -112,34 +112,6 @@ TextureImporter:
     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
@@ -154,34 +126,6 @@ TextureImporter:
     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: []

二进制
Assets/Art/UIAssets/decorate/dec_tx_di.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_tx_di.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: BitMtH75W35qcPRIdEHRQKtpFNzRJ+Sud8fOiShk1KkSpD9PhGXF6pyutQhQ
+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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_tx_kuang.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_tx_kuang.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: D3oes3urBnM+kwhXhmV4dYxpRTks3xtTx2LnoBTB128f9Yg7jXb8obaiH5kT
+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: 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
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

二进制
Assets/Art/UIAssets/decorate/dec_zanting.png


+ 3 - 3
Assets/Res/Config/EventConditionConfig.json

@@ -42,10 +42,10 @@
     },
     {
       "ID": 5,
-      "message": null,
+      "message": 2082,
       "Operation": null,
-      "ConditionType": null,
-      "finishCount": null
+      "ConditionType": 8,
+      "finishCount": 1
     }
   ]
 }

+ 78 - 26
Assets/Res/Config/EventConfig.json

@@ -14,7 +14,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": 3,
       "PrizeIDs": [
         1001
       ],
@@ -23,6 +22,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": 3,
       "EventValue": [
         5
       ],
@@ -46,7 +48,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -55,6 +56,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -75,7 +79,6 @@
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": 1,
       "PrizeIDs": [
         1001
       ],
@@ -84,6 +87,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": 1,
       "EventValue": [
         1004
       ],
@@ -101,7 +107,6 @@
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": 7,
       "PrizeIDs": [
         1001
       ],
@@ -110,6 +115,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": 7,
       "EventValue": [
         500
       ],
@@ -127,7 +135,6 @@
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -136,6 +143,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 218,
       "Description": 1940
@@ -150,7 +160,6 @@
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -159,6 +168,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 219,
       "Description": 1941
@@ -173,7 +185,6 @@
       "EventType": 2,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -182,6 +193,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 220,
       "Description": 1942
@@ -196,7 +210,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -205,6 +218,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -219,7 +235,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -228,6 +243,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -242,7 +260,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -251,6 +268,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -265,7 +285,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -274,6 +293,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -288,7 +310,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -297,6 +318,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": null,
       "Description": null
@@ -311,7 +335,6 @@
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -320,6 +343,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1906,
       "Description": 1914
@@ -334,7 +360,6 @@
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -343,6 +368,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1907,
       "Description": 1915
@@ -357,7 +385,6 @@
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -366,6 +393,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1908,
       "Description": 1916
@@ -380,7 +410,6 @@
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -389,6 +418,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1909,
       "Description": 1917
@@ -407,7 +439,6 @@
       "EventType": 1,
       "Score": 10,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -416,6 +447,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1943,
       "Description": 1944
@@ -434,7 +468,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -443,6 +476,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 174,
       "Description": 1936
@@ -463,7 +499,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -472,6 +507,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -490,7 +528,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -499,6 +536,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 1943,
       "Description": 1944
@@ -517,7 +557,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -526,6 +565,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 174,
       "Description": 1936
@@ -546,7 +588,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -555,6 +596,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 175,
       "Description": 1937
@@ -574,7 +618,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -583,6 +626,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 2035,
       "Description": 2036
@@ -598,7 +644,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -607,6 +652,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 2067,
       "Description": 2068
@@ -621,7 +669,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -633,6 +680,9 @@
       ],
       "RefreshProbability": null,
       "RefreshCount": null,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 2069,
       "Description": 2070
@@ -647,7 +697,6 @@
       "EventType": 1,
       "Score": 0,
       "EventQuality": 1,
-      "EventConditionId": null,
       "PrizeIDs": [
         1001
       ],
@@ -656,6 +705,9 @@
       ],
       "RefreshProbability": 30,
       "RefreshCount": 2,
+      "placeID": null,
+      "XiantuID": null,
+      "EventConditionId": null,
       "EventCount": null,
       "EventName": 2071,
       "Description": 2072

+ 52 - 50
Assets/Res/Config/EventLinkConfig.json

@@ -504,56 +504,6 @@
         100
       ]
     },
-    {
-      "ID": 100001,
-      "conciseEventMessage": 1910,
-      "EventConditionMessage": null,
-      "LanID": [
-        1914
-      ],
-      "NPCID": null,
-      "ConditionId": [
-        4
-      ],
-      "optionType": null,
-      "ResultType": 3,
-      "ResultOptions": [
-        10002
-      ]
-    },
-    {
-      "ID": 100002,
-      "conciseEventMessage": 1911,
-      "EventConditionMessage": null,
-      "NPCID": null,
-      "optionType": 2,
-      "optionPara1": [
-        100001
-      ],
-      "ResultType": 3,
-      "ResultOptions": [
-        10003
-      ]
-    },
-    {
-      "ID": 100003,
-      "conciseEventMessage": 1912,
-      "EventConditionMessage": null,
-      "NPCID": null,
-      "optionType": null,
-      "ResultType": 3,
-      "ResultOptions": [
-        10004
-      ]
-    },
-    {
-      "ID": 100004,
-      "conciseEventMessage": 1913,
-      "EventConditionMessage": null,
-      "NPCID": null,
-      "optionType": null,
-      "ResultType": null
-    },
     {
       "ID": 9003,
       "conciseEventMessage": 2036,
@@ -690,6 +640,58 @@
         100001
       ],
       "ResultType": null
+    },
+    {
+      "ID": 100001,
+      "conciseEventMessage": 2086,
+      "EventConditionMessage": null,
+      "LanID": [
+        2083,
+        2084,
+        2085
+      ],
+      "NPCID": null,
+      "ConditionId": [
+        5
+      ],
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10002
+      ]
+    },
+    {
+      "ID": 100002,
+      "conciseEventMessage": 1911,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "optionType": 2,
+      "optionPara1": [
+        100001
+      ],
+      "ResultType": 3,
+      "ResultOptions": [
+        10003
+      ]
+    },
+    {
+      "ID": 100003,
+      "conciseEventMessage": 1912,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "optionType": null,
+      "ResultType": 3,
+      "ResultOptions": [
+        10004
+      ]
+    },
+    {
+      "ID": 100004,
+      "conciseEventMessage": 1913,
+      "EventConditionMessage": null,
+      "NPCID": null,
+      "optionType": null,
+      "ResultType": null
     }
   ]
 }

+ 1772 - 8
Assets/Res/Config/LanguageChineseConfig.json

@@ -7634,7 +7634,7 @@
     },
     {
       "ID": 1909,
-      "txt": "达到境界"
+      "txt": "找到风灵珠"
     },
     {
       "ID": 1910,
@@ -7654,11 +7654,11 @@
     },
     {
       "ID": 1914,
-      "txt": "北海遥远,山高路险,我如今只有练气修为,何时能到?得一边修炼一边找路。"
+      "txt": "    北冥有鱼,其名为鲲……不过北海遥远,何时能寻得鲲鹏的踪迹。\n    好在我的神识尚在,可探天地,再加上刚刚的风铃,或许能寻得前路线索。"
     },
     {
       "ID": 1915,
-      "txt": "神识探得北海方向,有一条古径,隐于云山之间。\n    不过,古径深处妖气弥漫,有妖兽盘踞,需要破除后才能通过。\n    鲲鹏的秘密,可能和这些妖兽有关。"
+      "txt": "神识探得北海方向,有一条古径,隐于云山之间。\n不过,古径深处妖气弥漫,有妖兽盘踞,需要破除后才能通过。\n鲲鹏的秘密,可能和这些妖兽有关。"
     },
     {
       "ID": 1916,
@@ -8326,23 +8326,23 @@
     },
     {
       "ID": 2082,
-      "txt": "第一章.逍遥游"
+      "txt": "使用神识{0}/{1}"
     },
     {
       "ID": 2083,
-      "txt": "多次渡劫失败的你,误入“无何有之乡”,在这里受到了列子的指引,踏上了寻找七道心境的修仙之路。"
+      "txt": "北冥有鱼,其名为鲲……"
     },
     {
       "ID": 2084,
-      "txt": "无用的大葫芦"
+      "txt": "不过北海遥远,何时能寻得鲲鹏的踪迹。"
     },
     {
       "ID": 2085,
-      "txt": "惠子种出了巨大葫芦,他觉得毫无用处,非常生气!"
+      "txt": "好在我的神识尚在,可探天地,再加上刚刚的风铃,或许能寻得前路线索。"
     },
     {
       "ID": 2086,
-      "txt": "0"
+      "txt": "使用风铃唤醒还未泯灭的神识"
     },
     {
       "ID": 2087,
@@ -8351,6 +8351,1770 @@
     {
       "ID": 2088,
       "txt": "0"
+    },
+    {
+      "ID": 2089,
+      "txt": "0"
+    },
+    {
+      "ID": 2090,
+      "txt": "0"
+    },
+    {
+      "ID": 2091,
+      "txt": "0"
+    },
+    {
+      "ID": 2092,
+      "txt": "0"
+    },
+    {
+      "ID": 2093,
+      "txt": "0"
+    },
+    {
+      "ID": 2094,
+      "txt": "0"
+    },
+    {
+      "ID": 2095,
+      "txt": "0"
+    },
+    {
+      "ID": 2096,
+      "txt": "0"
+    },
+    {
+      "ID": 2097,
+      "txt": "0"
+    },
+    {
+      "ID": 2098,
+      "txt": "0"
+    },
+    {
+      "ID": 2099,
+      "txt": "0"
+    },
+    {
+      "ID": 2100,
+      "txt": "0"
+    },
+    {
+      "ID": 2101,
+      "txt": "0"
+    },
+    {
+      "ID": 2102,
+      "txt": "0"
+    },
+    {
+      "ID": 2103,
+      "txt": "0"
+    },
+    {
+      "ID": 2104,
+      "txt": "0"
+    },
+    {
+      "ID": 2105,
+      "txt": "0"
+    },
+    {
+      "ID": 2106,
+      "txt": "0"
+    },
+    {
+      "ID": 2107,
+      "txt": "0"
+    },
+    {
+      "ID": 2108,
+      "txt": "0"
+    },
+    {
+      "ID": 2109,
+      "txt": "0"
+    },
+    {
+      "ID": 2110,
+      "txt": "0"
+    },
+    {
+      "ID": 2111,
+      "txt": "0"
+    },
+    {
+      "ID": 2112,
+      "txt": "0"
+    },
+    {
+      "ID": 2113,
+      "txt": "0"
+    },
+    {
+      "ID": 2114,
+      "txt": "0"
+    },
+    {
+      "ID": 2115,
+      "txt": "0"
+    },
+    {
+      "ID": 2116,
+      "txt": "0"
+    },
+    {
+      "ID": 2117,
+      "txt": "0"
+    },
+    {
+      "ID": 2118,
+      "txt": "0"
+    },
+    {
+      "ID": 2119,
+      "txt": "0"
+    },
+    {
+      "ID": 2120,
+      "txt": "0"
+    },
+    {
+      "ID": 2121,
+      "txt": "0"
+    },
+    {
+      "ID": 2122,
+      "txt": "0"
+    },
+    {
+      "ID": 2123,
+      "txt": "0"
+    },
+    {
+      "ID": 2124,
+      "txt": "0"
+    },
+    {
+      "ID": 2125,
+      "txt": "0"
+    },
+    {
+      "ID": 2126,
+      "txt": "0"
+    },
+    {
+      "ID": 2127,
+      "txt": "0"
+    },
+    {
+      "ID": 2128,
+      "txt": "0"
+    },
+    {
+      "ID": 2129,
+      "txt": "0"
+    },
+    {
+      "ID": 2130,
+      "txt": "0"
+    },
+    {
+      "ID": 2131,
+      "txt": "0"
+    },
+    {
+      "ID": 2132,
+      "txt": "0"
+    },
+    {
+      "ID": 2133,
+      "txt": "0"
+    },
+    {
+      "ID": 2134,
+      "txt": "0"
+    },
+    {
+      "ID": 2135,
+      "txt": "0"
+    },
+    {
+      "ID": 2136,
+      "txt": "0"
+    },
+    {
+      "ID": 2137,
+      "txt": "0"
+    },
+    {
+      "ID": 2138,
+      "txt": "0"
+    },
+    {
+      "ID": 2139,
+      "txt": "0"
+    },
+    {
+      "ID": 2140,
+      "txt": "0"
+    },
+    {
+      "ID": 2141,
+      "txt": "0"
+    },
+    {
+      "ID": 2142,
+      "txt": "0"
+    },
+    {
+      "ID": 2143,
+      "txt": "0"
+    },
+    {
+      "ID": 2144,
+      "txt": "0"
+    },
+    {
+      "ID": 2145,
+      "txt": "0"
+    },
+    {
+      "ID": 2146,
+      "txt": "0"
+    },
+    {
+      "ID": 2147,
+      "txt": "0"
+    },
+    {
+      "ID": 2148,
+      "txt": "0"
+    },
+    {
+      "ID": 2149,
+      "txt": "0"
+    },
+    {
+      "ID": 2150,
+      "txt": "0"
+    },
+    {
+      "ID": 2151,
+      "txt": "0"
+    },
+    {
+      "ID": 2152,
+      "txt": "0"
+    },
+    {
+      "ID": 2153,
+      "txt": "0"
+    },
+    {
+      "ID": 2154,
+      "txt": "0"
+    },
+    {
+      "ID": 2155,
+      "txt": "0"
+    },
+    {
+      "ID": 2156,
+      "txt": "0"
+    },
+    {
+      "ID": 2157,
+      "txt": "0"
+    },
+    {
+      "ID": 2158,
+      "txt": "0"
+    },
+    {
+      "ID": 2159,
+      "txt": "0"
+    },
+    {
+      "ID": 2160,
+      "txt": "0"
+    },
+    {
+      "ID": 2161,
+      "txt": "0"
+    },
+    {
+      "ID": 2162,
+      "txt": "0"
+    },
+    {
+      "ID": 2163,
+      "txt": "0"
+    },
+    {
+      "ID": 2164,
+      "txt": "0"
+    },
+    {
+      "ID": 2165,
+      "txt": "0"
+    },
+    {
+      "ID": 2166,
+      "txt": "0"
+    },
+    {
+      "ID": 2167,
+      "txt": "0"
+    },
+    {
+      "ID": 2168,
+      "txt": "0"
+    },
+    {
+      "ID": 2169,
+      "txt": "0"
+    },
+    {
+      "ID": 2170,
+      "txt": "0"
+    },
+    {
+      "ID": 2171,
+      "txt": "0"
+    },
+    {
+      "ID": 2172,
+      "txt": "0"
+    },
+    {
+      "ID": 2173,
+      "txt": "0"
+    },
+    {
+      "ID": 2174,
+      "txt": "0"
+    },
+    {
+      "ID": 2175,
+      "txt": "0"
+    },
+    {
+      "ID": 2176,
+      "txt": "0"
+    },
+    {
+      "ID": 2177,
+      "txt": "0"
+    },
+    {
+      "ID": 2178,
+      "txt": "0"
+    },
+    {
+      "ID": 2179,
+      "txt": "0"
+    },
+    {
+      "ID": 2180,
+      "txt": "0"
+    },
+    {
+      "ID": 2181,
+      "txt": "0"
+    },
+    {
+      "ID": 2182,
+      "txt": "0"
+    },
+    {
+      "ID": 2183,
+      "txt": "0"
+    },
+    {
+      "ID": 2184,
+      "txt": "0"
+    },
+    {
+      "ID": 2185,
+      "txt": "0"
+    },
+    {
+      "ID": 2186,
+      "txt": "0"
+    },
+    {
+      "ID": 2187,
+      "txt": "0"
+    },
+    {
+      "ID": 2188,
+      "txt": "0"
+    },
+    {
+      "ID": 2189,
+      "txt": "0"
+    },
+    {
+      "ID": 2190,
+      "txt": "0"
+    },
+    {
+      "ID": 2191,
+      "txt": "0"
+    },
+    {
+      "ID": 2192,
+      "txt": "0"
+    },
+    {
+      "ID": 2193,
+      "txt": "0"
+    },
+    {
+      "ID": 2194,
+      "txt": "0"
+    },
+    {
+      "ID": 2195,
+      "txt": "0"
+    },
+    {
+      "ID": 2196,
+      "txt": "0"
+    },
+    {
+      "ID": 2197,
+      "txt": "0"
+    },
+    {
+      "ID": 2198,
+      "txt": "0"
+    },
+    {
+      "ID": 2199,
+      "txt": "0"
+    },
+    {
+      "ID": 2200,
+      "txt": "0"
+    },
+    {
+      "ID": 2201,
+      "txt": "0"
+    },
+    {
+      "ID": 2202,
+      "txt": "0"
+    },
+    {
+      "ID": 2203,
+      "txt": "0"
+    },
+    {
+      "ID": 2204,
+      "txt": "0"
+    },
+    {
+      "ID": 2205,
+      "txt": "0"
+    },
+    {
+      "ID": 2206,
+      "txt": "0"
+    },
+    {
+      "ID": 2207,
+      "txt": "0"
+    },
+    {
+      "ID": 2208,
+      "txt": "0"
+    },
+    {
+      "ID": 2209,
+      "txt": "0"
+    },
+    {
+      "ID": 2210,
+      "txt": "0"
+    },
+    {
+      "ID": 2211,
+      "txt": "0"
+    },
+    {
+      "ID": 2212,
+      "txt": "0"
+    },
+    {
+      "ID": 2213,
+      "txt": "0"
+    },
+    {
+      "ID": 2214,
+      "txt": "0"
+    },
+    {
+      "ID": 2215,
+      "txt": "0"
+    },
+    {
+      "ID": 2216,
+      "txt": "0"
+    },
+    {
+      "ID": 2217,
+      "txt": "0"
+    },
+    {
+      "ID": 2218,
+      "txt": "0"
+    },
+    {
+      "ID": 2219,
+      "txt": "0"
+    },
+    {
+      "ID": 2220,
+      "txt": "0"
+    },
+    {
+      "ID": 2221,
+      "txt": "0"
+    },
+    {
+      "ID": 2222,
+      "txt": "0"
+    },
+    {
+      "ID": 2223,
+      "txt": "0"
+    },
+    {
+      "ID": 2224,
+      "txt": "0"
+    },
+    {
+      "ID": 2225,
+      "txt": "0"
+    },
+    {
+      "ID": 2226,
+      "txt": "0"
+    },
+    {
+      "ID": 2227,
+      "txt": "0"
+    },
+    {
+      "ID": 2228,
+      "txt": "0"
+    },
+    {
+      "ID": 2229,
+      "txt": "0"
+    },
+    {
+      "ID": 2230,
+      "txt": "0"
+    },
+    {
+      "ID": 2231,
+      "txt": "0"
+    },
+    {
+      "ID": 2232,
+      "txt": "0"
+    },
+    {
+      "ID": 2233,
+      "txt": "0"
+    },
+    {
+      "ID": 2234,
+      "txt": "0"
+    },
+    {
+      "ID": 2235,
+      "txt": "0"
+    },
+    {
+      "ID": 2236,
+      "txt": "0"
+    },
+    {
+      "ID": 2237,
+      "txt": "0"
+    },
+    {
+      "ID": 2238,
+      "txt": "0"
+    },
+    {
+      "ID": 2239,
+      "txt": "0"
+    },
+    {
+      "ID": 2240,
+      "txt": "0"
+    },
+    {
+      "ID": 2241,
+      "txt": "0"
+    },
+    {
+      "ID": 2242,
+      "txt": "0"
+    },
+    {
+      "ID": 2243,
+      "txt": "0"
+    },
+    {
+      "ID": 2244,
+      "txt": "0"
+    },
+    {
+      "ID": 2245,
+      "txt": "0"
+    },
+    {
+      "ID": 2246,
+      "txt": "0"
+    },
+    {
+      "ID": 2247,
+      "txt": "0"
+    },
+    {
+      "ID": 2248,
+      "txt": "0"
+    },
+    {
+      "ID": 2249,
+      "txt": "0"
+    },
+    {
+      "ID": 2250,
+      "txt": "0"
+    },
+    {
+      "ID": 2251,
+      "txt": "0"
+    },
+    {
+      "ID": 2252,
+      "txt": "0"
+    },
+    {
+      "ID": 2253,
+      "txt": "0"
+    },
+    {
+      "ID": 2254,
+      "txt": "0"
+    },
+    {
+      "ID": 2255,
+      "txt": "0"
+    },
+    {
+      "ID": 2256,
+      "txt": "0"
+    },
+    {
+      "ID": 2257,
+      "txt": "0"
+    },
+    {
+      "ID": 2258,
+      "txt": "0"
+    },
+    {
+      "ID": 2259,
+      "txt": "0"
+    },
+    {
+      "ID": 2260,
+      "txt": "0"
+    },
+    {
+      "ID": 2261,
+      "txt": "0"
+    },
+    {
+      "ID": 2262,
+      "txt": "0"
+    },
+    {
+      "ID": 2263,
+      "txt": "0"
+    },
+    {
+      "ID": 2264,
+      "txt": "0"
+    },
+    {
+      "ID": 2265,
+      "txt": "0"
+    },
+    {
+      "ID": 2266,
+      "txt": "0"
+    },
+    {
+      "ID": 2267,
+      "txt": "0"
+    },
+    {
+      "ID": 2268,
+      "txt": "0"
+    },
+    {
+      "ID": 2269,
+      "txt": "0"
+    },
+    {
+      "ID": 2270,
+      "txt": "0"
+    },
+    {
+      "ID": 2271,
+      "txt": "0"
+    },
+    {
+      "ID": 2272,
+      "txt": "0"
+    },
+    {
+      "ID": 2273,
+      "txt": "0"
+    },
+    {
+      "ID": 2274,
+      "txt": "0"
+    },
+    {
+      "ID": 2275,
+      "txt": "0"
+    },
+    {
+      "ID": 2276,
+      "txt": "0"
+    },
+    {
+      "ID": 2277,
+      "txt": "0"
+    },
+    {
+      "ID": 2278,
+      "txt": "0"
+    },
+    {
+      "ID": 2279,
+      "txt": "0"
+    },
+    {
+      "ID": 2280,
+      "txt": "0"
+    },
+    {
+      "ID": 2281,
+      "txt": "0"
+    },
+    {
+      "ID": 2282,
+      "txt": "0"
+    },
+    {
+      "ID": 2283,
+      "txt": "0"
+    },
+    {
+      "ID": 2284,
+      "txt": "0"
+    },
+    {
+      "ID": 2285,
+      "txt": "0"
+    },
+    {
+      "ID": 2286,
+      "txt": "0"
+    },
+    {
+      "ID": 2287,
+      "txt": "0"
+    },
+    {
+      "ID": 2288,
+      "txt": "0"
+    },
+    {
+      "ID": 2289,
+      "txt": "0"
+    },
+    {
+      "ID": 2290,
+      "txt": "0"
+    },
+    {
+      "ID": 2291,
+      "txt": "0"
+    },
+    {
+      "ID": 2292,
+      "txt": "0"
+    },
+    {
+      "ID": 2293,
+      "txt": "0"
+    },
+    {
+      "ID": 2294,
+      "txt": "0"
+    },
+    {
+      "ID": 2295,
+      "txt": "0"
+    },
+    {
+      "ID": 2296,
+      "txt": "0"
+    },
+    {
+      "ID": 2297,
+      "txt": "0"
+    },
+    {
+      "ID": 2298,
+      "txt": "0"
+    },
+    {
+      "ID": 2299,
+      "txt": "0"
+    },
+    {
+      "ID": 2300,
+      "txt": "0"
+    },
+    {
+      "ID": 2301,
+      "txt": "0"
+    },
+    {
+      "ID": 2302,
+      "txt": "0"
+    },
+    {
+      "ID": 2303,
+      "txt": "0"
+    },
+    {
+      "ID": 2304,
+      "txt": "0"
+    },
+    {
+      "ID": 2305,
+      "txt": "0"
+    },
+    {
+      "ID": 2306,
+      "txt": "0"
+    },
+    {
+      "ID": 2307,
+      "txt": "0"
+    },
+    {
+      "ID": 2308,
+      "txt": "0"
+    },
+    {
+      "ID": 2309,
+      "txt": "0"
+    },
+    {
+      "ID": 2310,
+      "txt": "0"
+    },
+    {
+      "ID": 2311,
+      "txt": "0"
+    },
+    {
+      "ID": 2312,
+      "txt": "0"
+    },
+    {
+      "ID": 2313,
+      "txt": "0"
+    },
+    {
+      "ID": 2314,
+      "txt": "0"
+    },
+    {
+      "ID": 2315,
+      "txt": "0"
+    },
+    {
+      "ID": 2316,
+      "txt": "0"
+    },
+    {
+      "ID": 2317,
+      "txt": "0"
+    },
+    {
+      "ID": 2318,
+      "txt": "0"
+    },
+    {
+      "ID": 2319,
+      "txt": "0"
+    },
+    {
+      "ID": 2320,
+      "txt": "0"
+    },
+    {
+      "ID": 2321,
+      "txt": "0"
+    },
+    {
+      "ID": 2322,
+      "txt": "0"
+    },
+    {
+      "ID": 2323,
+      "txt": "0"
+    },
+    {
+      "ID": 2324,
+      "txt": "0"
+    },
+    {
+      "ID": 2325,
+      "txt": "0"
+    },
+    {
+      "ID": 2326,
+      "txt": "0"
+    },
+    {
+      "ID": 2327,
+      "txt": "0"
+    },
+    {
+      "ID": 2328,
+      "txt": "0"
+    },
+    {
+      "ID": 2329,
+      "txt": "0"
+    },
+    {
+      "ID": 2330,
+      "txt": "0"
+    },
+    {
+      "ID": 2331,
+      "txt": "0"
+    },
+    {
+      "ID": 2332,
+      "txt": "0"
+    },
+    {
+      "ID": 2333,
+      "txt": "0"
+    },
+    {
+      "ID": 2334,
+      "txt": "0"
+    },
+    {
+      "ID": 2335,
+      "txt": "0"
+    },
+    {
+      "ID": 2336,
+      "txt": "0"
+    },
+    {
+      "ID": 2337,
+      "txt": "0"
+    },
+    {
+      "ID": 2338,
+      "txt": "0"
+    },
+    {
+      "ID": 2339,
+      "txt": "0"
+    },
+    {
+      "ID": 2340,
+      "txt": "0"
+    },
+    {
+      "ID": 2341,
+      "txt": "0"
+    },
+    {
+      "ID": 2342,
+      "txt": "0"
+    },
+    {
+      "ID": 2343,
+      "txt": "0"
+    },
+    {
+      "ID": 2344,
+      "txt": "0"
+    },
+    {
+      "ID": 2345,
+      "txt": "0"
+    },
+    {
+      "ID": 2346,
+      "txt": "0"
+    },
+    {
+      "ID": 2347,
+      "txt": "0"
+    },
+    {
+      "ID": 2348,
+      "txt": "0"
+    },
+    {
+      "ID": 2349,
+      "txt": "0"
+    },
+    {
+      "ID": 2350,
+      "txt": "0"
+    },
+    {
+      "ID": 2351,
+      "txt": "0"
+    },
+    {
+      "ID": 2352,
+      "txt": "0"
+    },
+    {
+      "ID": 2353,
+      "txt": "0"
+    },
+    {
+      "ID": 2354,
+      "txt": "0"
+    },
+    {
+      "ID": 2355,
+      "txt": "0"
+    },
+    {
+      "ID": 2356,
+      "txt": "0"
+    },
+    {
+      "ID": 2357,
+      "txt": "0"
+    },
+    {
+      "ID": 2358,
+      "txt": "0"
+    },
+    {
+      "ID": 2359,
+      "txt": "0"
+    },
+    {
+      "ID": 2360,
+      "txt": "0"
+    },
+    {
+      "ID": 2361,
+      "txt": "0"
+    },
+    {
+      "ID": 2362,
+      "txt": "0"
+    },
+    {
+      "ID": 2363,
+      "txt": "0"
+    },
+    {
+      "ID": 2364,
+      "txt": "0"
+    },
+    {
+      "ID": 2365,
+      "txt": "0"
+    },
+    {
+      "ID": 2366,
+      "txt": "0"
+    },
+    {
+      "ID": 2367,
+      "txt": "0"
+    },
+    {
+      "ID": 2368,
+      "txt": "0"
+    },
+    {
+      "ID": 2369,
+      "txt": "0"
+    },
+    {
+      "ID": 2370,
+      "txt": "0"
+    },
+    {
+      "ID": 2371,
+      "txt": "0"
+    },
+    {
+      "ID": 2372,
+      "txt": "0"
+    },
+    {
+      "ID": 2373,
+      "txt": "0"
+    },
+    {
+      "ID": 2374,
+      "txt": "0"
+    },
+    {
+      "ID": 2375,
+      "txt": "0"
+    },
+    {
+      "ID": 2376,
+      "txt": "0"
+    },
+    {
+      "ID": 2377,
+      "txt": "0"
+    },
+    {
+      "ID": 2378,
+      "txt": "0"
+    },
+    {
+      "ID": 2379,
+      "txt": "0"
+    },
+    {
+      "ID": 2380,
+      "txt": "0"
+    },
+    {
+      "ID": 2381,
+      "txt": "0"
+    },
+    {
+      "ID": 2382,
+      "txt": "0"
+    },
+    {
+      "ID": 2383,
+      "txt": "0"
+    },
+    {
+      "ID": 2384,
+      "txt": "0"
+    },
+    {
+      "ID": 2385,
+      "txt": "0"
+    },
+    {
+      "ID": 2386,
+      "txt": "0"
+    },
+    {
+      "ID": 2387,
+      "txt": "0"
+    },
+    {
+      "ID": 2388,
+      "txt": "0"
+    },
+    {
+      "ID": 2389,
+      "txt": "0"
+    },
+    {
+      "ID": 2390,
+      "txt": "0"
+    },
+    {
+      "ID": 2391,
+      "txt": "0"
+    },
+    {
+      "ID": 2392,
+      "txt": "0"
+    },
+    {
+      "ID": 2393,
+      "txt": "0"
+    },
+    {
+      "ID": 2394,
+      "txt": "0"
+    },
+    {
+      "ID": 2395,
+      "txt": "0"
+    },
+    {
+      "ID": 2396,
+      "txt": "0"
+    },
+    {
+      "ID": 2397,
+      "txt": "0"
+    },
+    {
+      "ID": 2398,
+      "txt": "0"
+    },
+    {
+      "ID": 2399,
+      "txt": "0"
+    },
+    {
+      "ID": 2400,
+      "txt": "0"
+    },
+    {
+      "ID": 2401,
+      "txt": "0"
+    },
+    {
+      "ID": 2402,
+      "txt": "0"
+    },
+    {
+      "ID": 2403,
+      "txt": "0"
+    },
+    {
+      "ID": 2404,
+      "txt": "0"
+    },
+    {
+      "ID": 2405,
+      "txt": "0"
+    },
+    {
+      "ID": 2406,
+      "txt": "0"
+    },
+    {
+      "ID": 2407,
+      "txt": "0"
+    },
+    {
+      "ID": 2408,
+      "txt": "0"
+    },
+    {
+      "ID": 2409,
+      "txt": "0"
+    },
+    {
+      "ID": 2410,
+      "txt": "0"
+    },
+    {
+      "ID": 2411,
+      "txt": "0"
+    },
+    {
+      "ID": 2412,
+      "txt": "0"
+    },
+    {
+      "ID": 2413,
+      "txt": "0"
+    },
+    {
+      "ID": 2414,
+      "txt": "0"
+    },
+    {
+      "ID": 2415,
+      "txt": "0"
+    },
+    {
+      "ID": 2416,
+      "txt": "0"
+    },
+    {
+      "ID": 2417,
+      "txt": "0"
+    },
+    {
+      "ID": 2418,
+      "txt": "0"
+    },
+    {
+      "ID": 2419,
+      "txt": "0"
+    },
+    {
+      "ID": 2420,
+      "txt": "0"
+    },
+    {
+      "ID": 2421,
+      "txt": "0"
+    },
+    {
+      "ID": 2422,
+      "txt": "0"
+    },
+    {
+      "ID": 2423,
+      "txt": "0"
+    },
+    {
+      "ID": 2424,
+      "txt": "0"
+    },
+    {
+      "ID": 2425,
+      "txt": "0"
+    },
+    {
+      "ID": 2426,
+      "txt": "0"
+    },
+    {
+      "ID": 2427,
+      "txt": "0"
+    },
+    {
+      "ID": 2428,
+      "txt": "0"
+    },
+    {
+      "ID": 2429,
+      "txt": "0"
+    },
+    {
+      "ID": 2430,
+      "txt": "0"
+    },
+    {
+      "ID": 2431,
+      "txt": "0"
+    },
+    {
+      "ID": 2432,
+      "txt": "0"
+    },
+    {
+      "ID": 2433,
+      "txt": "0"
+    },
+    {
+      "ID": 2434,
+      "txt": "0"
+    },
+    {
+      "ID": 2435,
+      "txt": "0"
+    },
+    {
+      "ID": 2436,
+      "txt": "0"
+    },
+    {
+      "ID": 2437,
+      "txt": "0"
+    },
+    {
+      "ID": 2438,
+      "txt": "0"
+    },
+    {
+      "ID": 2439,
+      "txt": "0"
+    },
+    {
+      "ID": 2440,
+      "txt": "0"
+    },
+    {
+      "ID": 2441,
+      "txt": "0"
+    },
+    {
+      "ID": 2442,
+      "txt": "0"
+    },
+    {
+      "ID": 2443,
+      "txt": "0"
+    },
+    {
+      "ID": 2444,
+      "txt": "0"
+    },
+    {
+      "ID": 2445,
+      "txt": "0"
+    },
+    {
+      "ID": 2446,
+      "txt": "0"
+    },
+    {
+      "ID": 2447,
+      "txt": "0"
+    },
+    {
+      "ID": 2448,
+      "txt": "0"
+    },
+    {
+      "ID": 2449,
+      "txt": "0"
+    },
+    {
+      "ID": 2450,
+      "txt": "0"
+    },
+    {
+      "ID": 2451,
+      "txt": "0"
+    },
+    {
+      "ID": 2452,
+      "txt": "0"
+    },
+    {
+      "ID": 2453,
+      "txt": "0"
+    },
+    {
+      "ID": 2454,
+      "txt": "0"
+    },
+    {
+      "ID": 2455,
+      "txt": "0"
+    },
+    {
+      "ID": 2456,
+      "txt": "0"
+    },
+    {
+      "ID": 2457,
+      "txt": "0"
+    },
+    {
+      "ID": 2458,
+      "txt": "0"
+    },
+    {
+      "ID": 2459,
+      "txt": "0"
+    },
+    {
+      "ID": 2460,
+      "txt": "0"
+    },
+    {
+      "ID": 2461,
+      "txt": "0"
+    },
+    {
+      "ID": 2462,
+      "txt": "0"
+    },
+    {
+      "ID": 2463,
+      "txt": "0"
+    },
+    {
+      "ID": 2464,
+      "txt": "0"
+    },
+    {
+      "ID": 2465,
+      "txt": "0"
+    },
+    {
+      "ID": 2466,
+      "txt": "0"
+    },
+    {
+      "ID": 2467,
+      "txt": "0"
+    },
+    {
+      "ID": 2468,
+      "txt": "0"
+    },
+    {
+      "ID": 2469,
+      "txt": "0"
+    },
+    {
+      "ID": 2470,
+      "txt": "0"
+    },
+    {
+      "ID": 2471,
+      "txt": "0"
+    },
+    {
+      "ID": 2472,
+      "txt": "0"
+    },
+    {
+      "ID": 2473,
+      "txt": "0"
+    },
+    {
+      "ID": 2474,
+      "txt": "0"
+    },
+    {
+      "ID": 2475,
+      "txt": "0"
+    },
+    {
+      "ID": 2476,
+      "txt": "0"
+    },
+    {
+      "ID": 2477,
+      "txt": "0"
+    },
+    {
+      "ID": 2478,
+      "txt": "0"
+    },
+    {
+      "ID": 2479,
+      "txt": "0"
+    },
+    {
+      "ID": 2480,
+      "txt": "0"
+    },
+    {
+      "ID": 2481,
+      "txt": "0"
+    },
+    {
+      "ID": 2482,
+      "txt": "0"
+    },
+    {
+      "ID": 2483,
+      "txt": "0"
+    },
+    {
+      "ID": 2484,
+      "txt": "0"
+    },
+    {
+      "ID": 2485,
+      "txt": "0"
+    },
+    {
+      "ID": 2486,
+      "txt": "0"
+    },
+    {
+      "ID": 2487,
+      "txt": "0"
+    },
+    {
+      "ID": 2488,
+      "txt": "0"
+    },
+    {
+      "ID": 2489,
+      "txt": "0"
+    },
+    {
+      "ID": 2490,
+      "txt": "0"
+    },
+    {
+      "ID": 2491,
+      "txt": "0"
+    },
+    {
+      "ID": 2492,
+      "txt": "0"
+    },
+    {
+      "ID": 2493,
+      "txt": "0"
+    },
+    {
+      "ID": 2494,
+      "txt": "0"
+    },
+    {
+      "ID": 2495,
+      "txt": "0"
+    },
+    {
+      "ID": 2496,
+      "txt": "0"
+    },
+    {
+      "ID": 2497,
+      "txt": "0"
+    },
+    {
+      "ID": 2498,
+      "txt": "0"
+    },
+    {
+      "ID": 2499,
+      "txt": "0"
+    },
+    {
+      "ID": 2500,
+      "txt": "0"
+    },
+    {
+      "ID": 2501,
+      "txt": "0"
+    },
+    {
+      "ID": 2502,
+      "txt": "0"
+    },
+    {
+      "ID": 2503,
+      "txt": "0"
+    },
+    {
+      "ID": 2504,
+      "txt": "0"
+    },
+    {
+      "ID": 2505,
+      "txt": "0"
+    },
+    {
+      "ID": 2506,
+      "txt": "0"
+    },
+    {
+      "ID": 2507,
+      "txt": "0"
+    },
+    {
+      "ID": 2508,
+      "txt": "0"
+    },
+    {
+      "ID": 2509,
+      "txt": "0"
+    },
+    {
+      "ID": 2510,
+      "txt": "0"
+    },
+    {
+      "ID": 2511,
+      "txt": "0"
+    },
+    {
+      "ID": 2512,
+      "txt": "0"
+    },
+    {
+      "ID": 2513,
+      "txt": "0"
+    },
+    {
+      "ID": 2514,
+      "txt": "0"
+    },
+    {
+      "ID": 2515,
+      "txt": "0"
+    },
+    {
+      "ID": 2516,
+      "txt": "0"
+    },
+    {
+      "ID": 2517,
+      "txt": "0"
+    },
+    {
+      "ID": 2518,
+      "txt": "0"
+    },
+    {
+      "ID": 2519,
+      "txt": "0"
+    },
+    {
+      "ID": 2520,
+      "txt": "0"
+    },
+    {
+      "ID": 2521,
+      "txt": "0"
+    },
+    {
+      "ID": 2522,
+      "txt": "0"
+    },
+    {
+      "ID": 2523,
+      "txt": "0"
+    },
+    {
+      "ID": 2524,
+      "txt": "0"
+    },
+    {
+      "ID": 2525,
+      "txt": "0"
+    },
+    {
+      "ID": 2526,
+      "txt": "0"
+    },
+    {
+      "ID": 2527,
+      "txt": "0"
+    },
+    {
+      "ID": 2528,
+      "txt": "0"
+    },
+    {
+      "ID": 2529,
+      "txt": "0"
     }
   ]
 }

+ 2 - 13
Assets/Res/Config/XianTuLogConfig.json

@@ -4,24 +4,13 @@
       "ID": 1,
       "EventType": 1,
       "Ttile": 2082,
-      "Desc": 2083,
-      "Events": [
-        10001,
-        10002,
-        10003,
-        10004
-      ]
+      "Desc": 2083
     },
     {
       "ID": 2,
       "EventType": 2,
       "Ttile": 2084,
-      "Desc": 2085,
-      "Events": [
-        9025,
-        9014,
-        9031
-      ]
+      "Desc": 2085
     }
   ]
 }

文件差异内容过多而无法显示
+ 648 - 77
Assets/Res/UI/CombatPanel.prefab


+ 7 - 0
Assets/Res/UIAtlas/battle.spriteatlasv2

@@ -11,6 +11,9 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
+    - {fileID: 2800000, guid: eb258d4b1c80a0f4092c15143ccec9b0, type: 3}
+    - {fileID: 2800000, guid: d5d2bcfbb7340354b81f7b35d0490a39, type: 3}
+    - {fileID: 2800000, guid: c573d9d993cf5b04f923f498a4f8e9bc, type: 3}
     - {fileID: 2800000, guid: ed4f487e92f7228488e6761c3195ce63, type: 3}
     - {fileID: 2800000, guid: 289e281c65c1c5547bbf5637330a92b9, type: 3}
     - {fileID: 2800000, guid: 4909dd28f612aba43aafc836ea21c1d2, type: 3}
@@ -19,12 +22,16 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 335d092c70d42864db7408201593e62e, type: 3}
     - {fileID: 2800000, guid: 6c334e216a62ac94282ea07a0873cd7c, type: 3}
     - {fileID: 2800000, guid: c764dca922d22104d883d11a2ba097ce, type: 3}
+    - {fileID: 2800000, guid: c7c4ddcbef4172b4a86c9b5c06303593, type: 3}
+    - {fileID: 2800000, guid: 6ce37aed261b5dd448bc5082dced3794, type: 3}
     - {fileID: 2800000, guid: f3bf02f43ae683245a9fd08ea3669254, type: 3}
     - {fileID: 2800000, guid: 78191d7c1ee1bc34c87bb6690e8da67f, type: 3}
     - {fileID: 2800000, guid: 17278af695d218f4db68c44f54051175, type: 3}
     - {fileID: 2800000, guid: f812f2cc0fb3e214f957e38d3240cae7, type: 3}
     - {fileID: 2800000, guid: dd29c735c83523c438f49f6c5a84b917, type: 3}
     - {fileID: 2800000, guid: 9420c6149c9ecea40829470293c18bf1, type: 3}
+    - {fileID: 2800000, guid: 9ac1dd853c797664ea29abf0ecc80281, type: 3}
+    - {fileID: 2800000, guid: 0016a6e8804cc5c45875bea2cbedc155, type: 3}
     - {fileID: 2800000, guid: 3ebef0b933c6a884a9443eb76c68048a, type: 3}
     - {fileID: 2800000, guid: 11a050c820c03994a83b8d5cb60e55b8, type: 3}
     - {fileID: 2800000, guid: c3e90883db7078b42966fd3e59cb5bbc, type: 3}

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

@@ -56,12 +56,6 @@ public int Score;
 public int EventQuality;
 
 
-		/// <summary>
-		///触发条件类型 只能配处于什么状态和数值,不能配变化的数值
-		/// </summary>
-public int EventConditionId;
-
-
 		/// <summary>
 		///事件结局奖励
 		/// </summary>
@@ -92,6 +86,24 @@ public int RefreshProbability;
 public int RefreshCount;
 
 
+		/// <summary>
+		///属于哪张地图
+		/// </summary>
+public int placeID;
+
+
+		/// <summary>
+		///仙途日志ID
+		/// </summary>
+public int XiantuID;
+
+
+		/// <summary>
+		///触发条件类型 只能配处于什么状态和数值,不能配变化的数值
+		/// </summary>
+public int EventConditionId;
+
+
 		/// <summary>
 		///触发效果值
 		/// </summary>
@@ -105,13 +117,13 @@ public int EventCount;
 
 
 		/// <summary>
-		///描述(题目)
+		///任务标题
 		/// </summary>
 public int EventName;
 
 
 		/// <summary>
-		///事件主体描述
+		///任务详情界面的总描述
 		/// </summary>
 public int Description;
 

+ 3 - 3
Assets/Scripts/GameData/ExcelConfig/EventLinkConfig.cs

@@ -21,19 +21,19 @@ public int ID;
 
 
 		/// <summary>
-		///事件简介描述
+		///任务列表中的简洁描述
 		/// </summary>
 public int conciseEventMessage;
 
 
 		/// <summary>
-		///简介目标描述
+		///无任务目标时的补充文本
 		/// </summary>
 public int EventConditionMessage;
 
 
 		/// <summary>
-		///文本语言表ID
+		///对话
 		/// </summary>
 public int[] LanID;
 

+ 0 - 6
Assets/Scripts/GameData/ExcelConfig/XianTuLogConfig.cs

@@ -38,12 +38,6 @@ public int Ttile;
 public int Desc;
 
 
-		/// <summary>
-		///包含的事件
-		/// </summary>
-public int[] Events;
-
-
 	}
 
 }

二进制
Excel2Json/Excel/EventConfig.xlsx


二进制
Excel2Json/Excel/Language.xlsx


二进制
Excel2Json/Excel/Maps.xlsx


二进制
Excel2Json/Excel/修仙游戏数据规划表.xlsx


文件差异内容过多而无法显示
+ 0 - 0
UGUIPack/uguiconfig.db


文件差异内容过多而无法显示
+ 0 - 1
美术/unity_use_ui/TextrueJson/battle.txt


文件差异内容过多而无法显示
+ 0 - 0
美术/unity_use_ui/TextrueJson/tongyong.txt


二进制
美术/unity_use_ui/decorate/dec_auto_di.png


二进制
美术/unity_use_ui/decorate/dec_boss_tx.png


二进制
美术/unity_use_ui/decorate/dec_boss_tx_kuang.png


二进制
美术/unity_use_ui/decorate/dec_guaiwu_tx.png


二进制
美术/unity_use_ui/decorate/dec_jianbian_di.png


二进制
美术/unity_use_ui/decorate/dec_juxing_miaobian1.png


二进制
美术/unity_use_ui/decorate/dec_juxing_miaobian2.png


二进制
美术/unity_use_ui/decorate/dec_tx.png


二进制
美术/unity_use_ui/decorate/dec_tx_di.png


二进制
美术/unity_use_ui/decorate/dec_tx_kuang.png


二进制
美术/unity_use_ui/decorate/dec_zanting.png


部分文件因为文件数量过多而无法显示