Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

Assets/ManagedResources/Icon/LinshiSkill/linshi_2000420_gzn.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 57ba55f9caa9f824190d3248823ccb80
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 2f60e6702d20a6846bd8619e33cc58aa
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_2000450_gzn.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 5af8ea0722a25b4498e1cb90aa0a0bce
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: bc4dd6f6693f25d40a67ae453310295d
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_2001040_gb.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: aba1103db80f64c458f72bd1416da45e
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 8140311170bbf344fb462172d8a20009
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_2001810_dz.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: a0acddef21d2dd24a8d2fe03b1841789
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: a11e51c25510e3e4ea209cae939b1e7a
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_2002130_yl.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 8406be7cdbb8bdd418d4d0cc683fb9dc
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 33f0090543c9cd744b365ed813f501cb
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_2120_ny.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: f5e2bbbe81bcdaa4aac39023a2f333d2
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 80a6a59b92917af449b81990be48948d
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_2130_ny.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: d87a2158982e7c2479838eee16b201e1
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 745d7fe430b196a4b80ad34ab0d0ff17
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_3810_ym.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 9c08d3efaaca3db40a2ef99541599f59
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 46db49103dbaa5944b43c9d97a6a01c9
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_3820_ym.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 0ac4e7ac9dcedee449cafa8912935ea6
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 4f22a2e839c434c428ff39a74ac091a8
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_3830_ym.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 602f74df28d8cac42828bcd765848a25
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 7e5880b5df82cda43aa555498bad002f
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_3910_xne.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 91f97adcf59aa9a41a55c4d15a7a5c30
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 735f0c4fa9f2cfa4d9cdf7a3e7d75aa8
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_3920_xne.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: fa5f4da1e0f173942aa8228ba7d453fb
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 658742980b758684295a8a8791555c2e
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_3940_xne.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: e43fee50c8d3bb04caeeed41ee09e25f
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: f808c64137f41b54694eee6eb25469f7
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_4720_cn.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: d3a1829db3ce9f248b961a4ee176b914
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5ce107b04e4ca434696c90da867d23eb
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_7210_ly.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 59dd40f64ac6294449477a8eae4668dd
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 45cd0b9857679a24cbe222299992cda1
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_7220_ly.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: c6bdea0040d82ce4093b3d31ff240466
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 39b5afbcbb1df4b469259ac4c2e04b45
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_7320_nxt.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 0b432d154396f2c42b2d75875e2fe0da
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: be2c8a6fd58474844be2cba1149975b5
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_7340_nxt.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 01229d2504ac88544ae191888475ef85
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: b25ea6124c4ab484c989f19da67e26d8
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_7510_nxy.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 3b674174429a0c045980ac05cab374ff
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: ad2e2de7caf4ebf42854c3feecfe6a41
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_7520_nxy.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: c37a27a460cb1ac4384ba5f8aef7f3cc
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 002e5ae4fdc15334c8a0242a9ac02bd4
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Icon/LinshiSkill/linshi_7540_nxy.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 58b287c6fcad8d44d83c700bdd10f084
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -100
+    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
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 17a601b6dde071e4896b5f117766157b
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ManagedResources/Prefabs/UI/Battle/BattlePanel.prefab

@@ -201377,7 +201377,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7907494418019462310}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 99.999985}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1044302835}
@@ -201385,8 +201385,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -16.6}
-  m_SizeDelta: {x: 107.88, y: 147.18}
+  m_AnchoredPosition: {x: 0, y: -80}
+  m_SizeDelta: {x: 290, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &3968067316172691295
 MonoBehaviour:
@@ -237663,7 +237663,12 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -3.6899986
+      objectReference: {fileID: 0}
+    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -237673,7 +237678,7 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -237683,26 +237688,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 20.492996
       objectReference: {fileID: 0}
-    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -3.6899986
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -16.999998
-      objectReference: {fileID: 0}
     - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -237713,12 +237708,12 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
+      value: -16.999998
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
@@ -237728,6 +237723,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &4228769374436639584 stripped
@@ -237858,7 +237858,12 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -3.6899986
+      objectReference: {fileID: 0}
+    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -237868,7 +237873,7 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -237878,26 +237883,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 20.492996
       objectReference: {fileID: 0}
-    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -3.6899986
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -16.999998
-      objectReference: {fileID: 0}
     - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -237908,12 +237903,12 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
+      value: -16.999998
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
@@ -237923,6 +237918,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &4082100120160718929 stripped
@@ -238198,7 +238198,12 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -3.6899986
+      objectReference: {fileID: 0}
+    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -238208,7 +238213,7 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -238218,26 +238223,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 20.492996
       objectReference: {fileID: 0}
-    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -3.6899986
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -16.999998
-      objectReference: {fileID: 0}
     - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -238248,12 +238243,12 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
+      value: -16.999998
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
@@ -238263,6 +238258,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &732539848799529134 stripped
@@ -238393,7 +238393,12 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -3.6899986
+      objectReference: {fileID: 0}
+    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -238403,7 +238408,7 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -238413,26 +238418,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 20.492996
       objectReference: {fileID: 0}
-    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -3.6899986
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -16.999998
-      objectReference: {fileID: 0}
     - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -238443,12 +238438,12 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
+      value: -16.999998
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
@@ -238458,6 +238453,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &1614343476964916978 stripped
@@ -238588,7 +238588,12 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -3.6899986
+      objectReference: {fileID: 0}
+    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -238598,7 +238603,7 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -238608,26 +238613,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 20.492996
       objectReference: {fileID: 0}
-    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -3.6899986
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -16.999998
-      objectReference: {fileID: 0}
     - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -238638,12 +238633,12 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
+      value: -16.999998
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
@@ -238653,6 +238648,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &6954216252396688781 stripped
@@ -239178,7 +239178,12 @@ PrefabInstance:
       propertyPath: m_Pivot.y
       value: 0.5
       objectReference: {fileID: 0}
-    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -3.6899986
+      objectReference: {fileID: 0}
+    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -239188,7 +239193,7 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 7166466205860675985, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
@@ -239198,26 +239203,16 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: 20.492996
       objectReference: {fileID: 0}
-    - target: {fileID: 8137459246776515621, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 1911345855364311612, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: -3.6899986
       objectReference: {fileID: 0}
-    - target: {fileID: 6850558047519458594, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -3.6899986
-      objectReference: {fileID: 0}
-    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
-        type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -16.999998
-      objectReference: {fileID: 0}
     - target: {fileID: 2320031819902321005, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
@@ -239228,12 +239223,12 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031820207909310, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819931042899, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 3.2600002
+      value: -16.999998
       objectReference: {fileID: 0}
-    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+    - target: {fileID: 2320031819195525549, guid: e356d5948e4971f499cfe38db3551f59,
         type: 3}
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
@@ -239243,6 +239238,11 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 3.2600002
       objectReference: {fileID: 0}
+    - target: {fileID: 2320031818352649172, guid: e356d5948e4971f499cfe38db3551f59,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 3.2600002
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: e356d5948e4971f499cfe38db3551f59, type: 3}
 --- !u!224 &5143580857320041208 stripped

Assets/ManagedResources/Prefabs/UI/Carbon/CarbonScoreSortPanel.prefab

@@ -1893,32 +1893,32 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   tweenSequeue:
-  - initV3: {x: 0, y: -182, z: 0}
+  - initV3: {x: 1.3, y: 1.3, z: 1.3}
     initFloat: 0
     isInit: 1
-    changeV3: {x: -1.58, y: -16, z: 0}
+    changeV3: {x: 0.95, y: 0.95, z: 0.95}
     changeFloat: 0
-    duration: 0.8
+    duration: 0.2
     delay: 0
-    curveType: 10
-    changeType: 0
-    sequeueType: 1
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
     loop: 0
     loopType: 0
-    targetObj: {fileID: 1749343158}
-  - initV3: {x: 0, y: 0, z: 0}
+    targetObj: {fileID: 0}
+  - initV3: {x: 0.95, y: 0.95, z: 0.95}
     initFloat: 0
-    isInit: 1
-    changeV3: {x: 0, y: 0, z: 0}
-    changeFloat: 1
-    duration: 1
+    isInit: 0
+    changeV3: {x: 1, y: 1, z: 1}
+    changeFloat: 0
+    duration: 0.1
     delay: 0
-    curveType: 7
-    changeType: 8
-    sequeueType: 1
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
     loop: 0
     loopType: 0
-    targetObj: {fileID: 1749343158}
+    targetObj: {fileID: 0}
   isPlayAudio: 1
   isHaveCloseBtn: 0
   isPlayOnOpen: 1
@@ -17872,7 +17872,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 0.000030517578, y: 0}
+  m_AnchoredPosition: {x: 0.000000060634875, y: 0}
   m_SizeDelta: {x: 0, y: 150}
   m_Pivot: {x: 0, y: 1}
 --- !u!114 &9124142079699260777

Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRankPopup.prefab

@@ -2351,6 +2351,7 @@ GameObject:
   m_Component:
   - component: {fileID: 3401751871378385210}
   - component: {fileID: 2077485594265078656}
+  - component: {fileID: 6746445292052274791}
   m_Layer: 5
   m_Name: Panel
   m_TagString: Untagged
@@ -2390,6 +2391,48 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5769642898174042025}
   m_CullTransparentMesh: 0
+--- !u!114 &6746445292052274791
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5769642898174042025}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenSequeue:
+  - initV3: {x: 1.3, y: 1.3, z: 1.3}
+    initFloat: 0
+    isInit: 1
+    changeV3: {x: 0.95, y: 0.95, z: 0.95}
+    changeFloat: 0
+    duration: 0.2
+    delay: 0
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
+    loop: 0
+    loopType: 0
+    targetObj: {fileID: 0}
+  - initV3: {x: 0.95, y: 0.95, z: 0.95}
+    initFloat: 0
+    isInit: 0
+    changeV3: {x: 1, y: 1, z: 1}
+    changeFloat: 0
+    duration: 0.1
+    delay: 0
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
+    loop: 0
+    loopType: 0
+    targetObj: {fileID: 0}
+  isPlayAudio: 1
+  isHaveCloseBtn: 0
+  isPlayOnOpen: 1
 --- !u!1 &6612251421837391838
 GameObject:
   m_ObjectHideFlags: 0

Assets/ManagedResources/Prefabs/UI/Carbon/XuanYuanMirrorRewardSortPopup.prefab

@@ -567,6 +567,7 @@ GameObject:
   - component: {fileID: 8510080390074448186}
   - component: {fileID: 576436720797261142}
   - component: {fileID: 3454768900339695438}
+  - component: {fileID: 8394798130360974924}
   m_Layer: 5
   m_Name: bg
   m_TagString: Untagged
@@ -636,6 +637,48 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+--- !u!114 &8394798130360974924
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1666056707232141115}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenSequeue:
+  - initV3: {x: 1.3, y: 1.3, z: 1.3}
+    initFloat: 0
+    isInit: 1
+    changeV3: {x: 0.95, y: 0.95, z: 0.95}
+    changeFloat: 0
+    duration: 0.2
+    delay: 0
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
+    loop: 0
+    loopType: 0
+    targetObj: {fileID: 0}
+  - initV3: {x: 0.95, y: 0.95, z: 0.95}
+    initFloat: 0
+    isInit: 0
+    changeV3: {x: 1, y: 1, z: 1}
+    changeFloat: 0
+    duration: 0.1
+    delay: 0
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
+    loop: 0
+    loopType: 0
+    targetObj: {fileID: 0}
+  isPlayAudio: 1
+  isHaveCloseBtn: 0
+  isPlayOnOpen: 1
 --- !u!1 &2023465797228292676
 GameObject:
   m_ObjectHideFlags: 0
@@ -1002,6 +1045,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 1493789284434423553}
+  - component: {fileID: 8345976921329614603}
   m_Layer: 5
   m_Name: scroll
   m_TagString: Untagged
@@ -1029,6 +1073,48 @@ RectTransform:
   m_AnchoredPosition: {x: -2.3, y: -46.175}
   m_SizeDelta: {x: 858.4, y: 1028.3}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8345976921329614603
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3205216122775585289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenSequeue:
+  - initV3: {x: 1.3, y: 1.3, z: 1.3}
+    initFloat: 0
+    isInit: 1
+    changeV3: {x: 0.95, y: 0.95, z: 0.95}
+    changeFloat: 0
+    duration: 0.2
+    delay: 0
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
+    loop: 0
+    loopType: 0
+    targetObj: {fileID: 0}
+  - initV3: {x: 0.95, y: 0.95, z: 0.95}
+    initFloat: 0
+    isInit: 0
+    changeV3: {x: 1, y: 1, z: 1}
+    changeFloat: 0
+    duration: 0.1
+    delay: 0
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
+    loop: 0
+    loopType: 0
+    targetObj: {fileID: 0}
+  isPlayAudio: 1
+  isHaveCloseBtn: 0
+  isPlayOnOpen: 1
 --- !u!1 &3744597273517501067
 GameObject:
   m_ObjectHideFlags: 0

Assets/ManagedResources/Prefabs/UI/Guild/Aid/GuildAidMainPopup.prefab

@@ -2929,6 +2929,7 @@ GameObject:
   - component: {fileID: 5833685402853382538}
   - component: {fileID: 2383357295960407526}
   - component: {fileID: 656759131260248062}
+  - component: {fileID: 8048889876096211871}
   m_Layer: 5
   m_Name: bg
   m_TagString: Untagged
@@ -2996,6 +2997,35 @@ MonoBehaviour:
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
+--- !u!114 &8048889876096211871
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3599375895462686603}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenSequeue:
+  - initV3: {x: 0, y: -300, z: 0}
+    initFloat: 0
+    isInit: 1
+    changeV3: {x: 0, y: 0, z: 0}
+    changeFloat: 0
+    duration: 0.8
+    delay: 0
+    curveType: 10
+    changeType: 0
+    sequeueType: 1
+    loop: 0
+    loopType: 0
+    targetObj: {fileID: 0}
+  isPlayAudio: 1
+  isHaveCloseBtn: 0
+  isPlayOnOpen: 1
 --- !u!1 &3770032720140774719
 GameObject:
   m_ObjectHideFlags: 0

Assets/ManagedResources/Prefabs/UI/Guild/GuildFetePopup.prefab

@@ -5024,7 +5024,7 @@ ParticleSystem:
 --- !u!199 &5040103470708412571
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -11204,7 +11204,7 @@ ParticleSystem:
 --- !u!199 &7022009138468795937
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -15916,7 +15916,7 @@ ParticleSystem:
 --- !u!199 &21284196286945555
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -21231,7 +21231,7 @@ ParticleSystem:
 --- !u!199 &7662304376647596786
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -27835,7 +27835,7 @@ ParticleSystem:
 --- !u!199 &6866467361509154070
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -33072,7 +33072,7 @@ ParticleSystem:
 --- !u!199 &1327544058612887100
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -33368,6 +33368,7 @@ GameObject:
   m_Component:
   - component: {fileID: 182146550924450489}
   - component: {fileID: 4418650615390458020}
+  - component: {fileID: 6200012128066425501}
   m_Layer: 5
   m_Name: Panel
   m_TagString: Untagged
@@ -33411,6 +33412,35 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4532427157487531891}
   m_CullTransparentMesh: 0
+--- !u!114 &6200012128066425501
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4532427157487531891}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenSequeue:
+  - initV3: {x: 0, y: -300, z: 0}
+    initFloat: 0
+    isInit: 1
+    changeV3: {x: 0, y: 0, z: 0}
+    changeFloat: 0
+    duration: 0.8
+    delay: 0
+    curveType: 10
+    changeType: 0
+    sequeueType: 1
+    loop: 0
+    loopType: 0
+    targetObj: {fileID: 0}
+  isPlayAudio: 1
+  isHaveCloseBtn: 0
+  isPlayOnOpen: 1
 --- !u!1 &4579790377340978839
 GameObject:
   m_ObjectHideFlags: 0
@@ -38871,7 +38901,7 @@ ParticleSystem:
 --- !u!199 &5724314893189987714
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -43667,7 +43697,7 @@ ParticleSystem:
 --- !u!199 &6600377722598462734
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -48524,7 +48554,7 @@ ParticleSystem:
 --- !u!199 &4723643438741483705
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -54001,7 +54031,7 @@ ParticleSystem:
 --- !u!199 &1522648081567467163
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -59378,7 +59408,7 @@ ParticleSystem:
 --- !u!199 &557479208284238603
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -64346,7 +64376,7 @@ ParticleSystem:
 --- !u!199 &2718336770233971512
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -69319,7 +69349,7 @@ ParticleSystem:
 --- !u!199 &4783855359569395394
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -74327,7 +74357,7 @@ ParticleSystem:
 --- !u!199 &1454716228256041344
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -78958,7 +78988,7 @@ ParticleSystem:
 --- !u!199 &1406671002734066039
 ParticleSystemRenderer:
   serializedVersion: 6
-  m_ObjectHideFlags: 0
+  m_ObjectHideFlags: 2
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}

Assets/ManagedResources/Prefabs/UI/Popup/TrialRewardPopup.prefab

@@ -3283,32 +3283,32 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   tweenSequeue:
-  - initV3: {x: 0, y: -300, z: 0}
+  - initV3: {x: 1.3, y: 1.3, z: 1.3}
     initFloat: 0
     isInit: 1
-    changeV3: {x: 0, y: 0, z: 0}
+    changeV3: {x: 0.95, y: 0.95, z: 0.95}
     changeFloat: 0
-    duration: 0.8
+    duration: 0.2
     delay: 0
-    curveType: 10
-    changeType: 0
-    sequeueType: 1
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
     loop: 0
     loopType: 0
-    targetObj: {fileID: 2678681961408120951}
-  - initV3: {x: 0, y: 0, z: 0}
+    targetObj: {fileID: 0}
+  - initV3: {x: 0.95, y: 0.95, z: 0.95}
     initFloat: 0
-    isInit: 1
-    changeV3: {x: 0, y: 0, z: 0}
-    changeFloat: 1
-    duration: 1
+    isInit: 0
+    changeV3: {x: 1, y: 1, z: 1}
+    changeFloat: 0
+    duration: 0.1
     delay: 0
-    curveType: 7
-    changeType: 8
-    sequeueType: 1
+    curveType: 1
+    changeType: 4
+    sequeueType: 0
     loop: 0
     loopType: 0
-    targetObj: {fileID: 2678681961408120951}
+    targetObj: {fileID: 0}
   isPlayAudio: 1
   isHaveCloseBtn: 0
   isPlayOnOpen: 1

Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua

@@ -179,9 +179,12 @@ function PlayerView:onCreate(go, role, position, root)
     self.rageText.gameObject:SetActive(false)
     self.rageText.text = ""
     self.lvHpObj=Util.GetGameObject(go, "lvObj")
+    self.buffRoot=Util.GetGameObject(go, "buff")
     if position<=3 then
+        self.buffRoot:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,389,0)
         self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,469,0)
     else
+        self.buffRoot:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,-80,0)
         self.lvHpObj:GetComponent("RectTransform").anchoredPosition=Vector3.New(0,0,0)
     end
     self.currAniName=""
@@ -196,7 +199,7 @@ function PlayerView:onCreate(go, role, position, root)
     -- 飘字管理    
     self.Floater = FloatNode.New(self, self.RootPanel, self.GameObject)
     -- buff管理
-    self.BuffCtrl = BuffCtrl.New(self, Util.GetGameObject(go, "buff"))
+    self.BuffCtrl = BuffCtrl.New(self, self.buffRoot)
     -- 创建技能播放器
     self.SkillCaster = SkillCaster.New(self, self.spAtkTime, self.atkSoundTime, self.attackSound, self.castingEfectNode, self.castingNameNode)
 

Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua

@@ -126,7 +126,9 @@ function DailyCarbonPanel:OnShow()
     if carbonIndex==0 then carbonIndex=1 end
     this.TabCtrl:SetTabAdapter(this.TabAdapter)
     this.TabCtrl:SetTabIsLockCheck(this.TabIsLockCheck)
-    this.TabCtrl:SetChangeTabCallBack(this.RefreshShow,true,true)
+    this.TabCtrl:SetChangeTabCallBack(function(index)  
+        this.RefreshShow(index, true,true)
+    end)
     this.TabCtrl:Init(this.tabBox, _TabData,carbonIndex)
     -- 音效
     SoundManager.PlayMusic(SoundConfig.BGM_Carbon)