随从功能优化

ColorlessWorld-2024-4-2/Assets/ArtAssets/Charater/Servant.meta

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

ColorlessWorld-2024-4-2/Assets/ArtAssets/Charater/Servant/Sslx_Cha_SuiCong_HuanXiongi_v01.png.meta

@@ -0,0 +1,149 @@
+fileFormatVersion: 2
+guid: 55e5d0c0b0b03a441b1566edc450b5b1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  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
+    resizeAlgorithm: 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
+    resizeAlgorithm: 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
+    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:
+    - serializedVersion: 2
+      name: Sslx_Cha_SuiCong_HuanXiongi_v01_0
+      rect:
+        serializedVersion: 2
+        x: 58
+        y: 136
+        width: 1469
+        height: 1902
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 84c7f8f79b5654944af8e09fb14fb6de
+      internalID: -556281538
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      Sslx_Cha_SuiCong_HuanXiongi_v01_0: -556281538
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Servent.meta

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

ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Servent/Sslx_Ui_SuiCong_DiBan_v01.png.meta

@@ -0,0 +1,150 @@
+fileFormatVersion: 2
+guid: c1b4ab583c5a93645b36caf772152563
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  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
+    resizeAlgorithm: 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
+    resizeAlgorithm: 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
+    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:
+    - serializedVersion: 2
+      name: Sslx_Ui_SuiCong_DiBan_v01_0
+      rect:
+        serializedVersion: 2
+        x: 141
+        y: 942
+        width: 1424
+        height: 462
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: f375f61bdd550914ca4adcdaa87c0cc6
+      internalID: -532680840
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: f897c268df3d1c348ad96819a134db1e
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      Sslx_Ui_SuiCong_DiBan_v01_0: -532680840
+      Sslx_Ui_SuiCong_DiBan_v01_1: -1676112269
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Servent/Sslx_Ui_SuiCong_JiNengKuang_v01.png.meta

@@ -0,0 +1,149 @@
+fileFormatVersion: 2
+guid: 891a2fb53d3886b4ea65d4cb17c010fb
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  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
+    resizeAlgorithm: 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
+    resizeAlgorithm: 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
+    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:
+    - serializedVersion: 2
+      name: Sslx_Ui_SuiCong_JiNengKuang_v01_0
+      rect:
+        serializedVersion: 2
+        x: 604
+        y: 890
+        width: 468
+        height: 468
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 34cec55a000e48f4fa15fb01a9d56e89
+      internalID: 565791774
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 9c7f35afc4ee4e7419c0acf97389261f
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      Sslx_Ui_SuiCong_JiNengKuang_v01_0: 565791774
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Servent/Sslx_Ui_SuiCong_MiaoShuKuang_v01.png.meta

@@ -0,0 +1,150 @@
+fileFormatVersion: 2
+guid: 817eb3241d234dc45ae34ae7d0936d05
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  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
+    resizeAlgorithm: 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
+    resizeAlgorithm: 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
+    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:
+    - serializedVersion: 2
+      name: Sslx_Ui_SuiCong_MiaoShuKuang_v01_0
+      rect:
+        serializedVersion: 2
+        x: 131
+        y: 932
+        width: 1447
+        height: 483
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 2b932835725f11f41a9e6985d815a25e
+      internalID: -1048651579
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 4228487f589afae41a8016a2c4db26ec
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      Sslx_Ui_SuiCong_MiaoShuKuang_v01_0: -1048651579
+      Sslx_Ui_SuiCong_MiaoShuKuang_v01_1: -815206286
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Servent/Sslx_Ui_SuiCong_XueTiao_v01.png.meta

@@ -0,0 +1,149 @@
+fileFormatVersion: 2
+guid: ae037ccfb7aae5344a3ac77b2145544b
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  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
+    resizeAlgorithm: 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
+    resizeAlgorithm: 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
+    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:
+    - serializedVersion: 2
+      name: Sslx_Ui_SuiCong_XueTiao_v01_0
+      rect:
+        serializedVersion: 2
+        x: 230
+        y: 1122
+        width: 1326
+        height: 135
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 556d94e1bfb13534b9d7c3278e6cf3cc
+      internalID: 336204301
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 8d23e49dd6e5d034f86d4a8392a6036f
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      Sslx_Ui_SuiCong_XueTiao_v01_0: 336204301
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/ArtAssets/UI/Servent/Sslx_Ui_SuiCong__XueKuang_v01.png.meta

@@ -0,0 +1,150 @@
+fileFormatVersion: 2
+guid: e473e1367c7d7f141a660b4707dd6eb1
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  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
+    resizeAlgorithm: 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
+    resizeAlgorithm: 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
+    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:
+    - serializedVersion: 2
+      name: Sslx_Ui_SuiCong__XueKuang_v01_1
+      rect:
+        serializedVersion: 2
+        x: 218
+        y: 1104
+        width: 1354
+        height: 169
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 5860b626e63edd2429fb68a9400ed539
+      internalID: 198574905
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: fe8b823f247fb2a42a3e1538785e30a4
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      Sslx_Ui_SuiCong__XueKuang_v01_0: 1692534453
+      Sslx_Ui_SuiCong__XueKuang_v01_1: 198574905
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/ArtAssets/企业微信截图_17270970911753.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 48ef24ba9c4b2bf4e82e671e33eb713e
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  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: 0
+  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
+    resizeAlgorithm: 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
+    resizeAlgorithm: 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
+    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: 

ColorlessWorld-2024-4-2/Assets/Audio/AnimVoic/攻击.wav.meta → ColorlessWorld-2024-4-2/Assets/Audio/AnimVoic/叠甲.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0f2b6b8613f1f9045a7a158aff6132b0
+guid: 1a8b7bce59c31c54e8d7e6e7295e3056
 AudioImporter:
   externalObjects: {}
   serializedVersion: 7

ColorlessWorld-2024-4-2/Assets/Audio/AnimVoic/攻击护盾.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: ca95256c03327674d96574b51acdcdbc
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Audio/AnimVoic/近战攻击.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: dfb2db36b83c4d74f9505e29f70de74a
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Audio/Buff.meta

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

ColorlessWorld-2024-4-2/Assets/Audio/Buff/Buff.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: bd6fab9cce558f440845ce601864c770
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Audio/UI/点击.wav.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: fbdba0f9a7b4f2d4ca75a2887c6d946a
+guid: f2c69a8197a74664e874228e15f8b18e
 AudioImporter:
   externalObjects: {}
   serializedVersion: 7

ColorlessWorld-2024-4-2/Assets/Audio/UI/点击确认.wav.meta

@@ -0,0 +1,23 @@
+fileFormatVersion: 2
+guid: 7f1f0990752c5374684514f002acaf1c
+AudioImporter:
+  externalObjects: {}
+  serializedVersion: 7
+  defaultSettings:
+    serializedVersion: 2
+    loadType: 0
+    sampleRateSetting: 0
+    sampleRateOverride: 44100
+    compressionFormat: 1
+    quality: 1
+    conversionMode: 0
+    preloadAudioData: 0
+  platformSettingOverrides: {}
+  forceToMono: 0
+  normalize: 1
+  loadInBackground: 0
+  ambisonic: 0
+  3D: 1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Image/PlayerAnim/AttackShort.anim

@@ -22,21 +22,21 @@ AnimationClip:
     curve:
     - time: 0
       value: {fileID: 21300000, guid: a42b63ef21b40a44188d10ccba5f8a13, type: 3}
-    - time: 0.13333334
+    - time: 0.11666667
       value: {fileID: 21300000, guid: 1f671c9075dd43a42aaaa0a1fb47f7ac, type: 3}
-    - time: 0.26666668
+    - time: 0.25
       value: {fileID: 21300000, guid: 084d501d700b53a4cbcf7cbf423e67d7, type: 3}
-    - time: 0.36666667
+    - time: 0.41666666
       value: {fileID: 21300000, guid: d9673e81d5dbef745bcb63be76b8e000, type: 3}
-    - time: 0.5
+    - time: 0.46666667
       value: {fileID: 21300000, guid: 1d4ba1b6112198142a185ded66277a64, type: 3}
-    - time: 0.6333333
+    - time: 0.51666665
       value: {fileID: 21300000, guid: 678cca87b106cc14590858c1340709fe, type: 3}
-    - time: 0.73333335
+    - time: 0.5833333
       value: {fileID: 21300000, guid: 3dbf4b665e51a804187aa2b0f09c58a0, type: 3}
-    - time: 0.8666667
+    - time: 0.71666664
       value: {fileID: 21300000, guid: fcb87208a15c34143bf685c3e3f9e1e7, type: 3}
-    - time: 1
+    - time: 0.8833333
       value: {fileID: 21300000, guid: 49f20f73a6b13914ba24d8e3a33752a9, type: 3}
     attribute: m_Sprite
     path: 
@@ -74,7 +74,7 @@ AnimationClip:
     m_AdditiveReferencePoseClip: {fileID: 0}
     m_AdditiveReferencePoseTime: 0
     m_StartTime: 0
-    m_StopTime: 1.0166667
+    m_StopTime: 0.9
     m_OrientationOffsetY: 0
     m_Level: 0
     m_CycleOffset: 0
@@ -94,7 +94,7 @@ AnimationClip:
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
   m_Events:
-  - time: 0
+  - time: 0.36666667
     functionName: AttackVoicePlayer
     data: 
     objectReferenceParameter: {fileID: 0}

ColorlessWorld-2024-4-2/Assets/Prefab/Sevant/ServantSkill/SkillUI.prefab

@@ -1,5 +1,80 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &233124577387034040
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8152314499649109330}
+  - component: {fileID: 6542528944205818237}
+  - component: {fileID: 6046906242867050866}
+  m_Layer: 7
+  m_Name: Panel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8152314499649109330
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 233124577387034040}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6590472616143143499}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6542528944205818237
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 233124577387034040}
+  m_CullTransparentMesh: 1
+--- !u!114 &6046906242867050866
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 233124577387034040}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 565791774, guid: 891a2fb53d3886b4ea65d4cb17c010fb, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &7216391201375852461
 GameObject:
   m_ObjectHideFlags: 0
@@ -30,15 +105,16 @@ RectTransform:
   m_GameObject: {fileID: 7216391201375852461}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0.00000012912}
-  m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
-  m_Children: []
+  m_Children:
+  - {fileID: 8152314499649109330}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 0.45, y: 0.45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8783577258385544724
 CanvasRenderer:
@@ -68,7 +144,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 6bb6daa2b9becef4d9fad23fa49a2fc2, type: 3}
+  m_Sprite: {fileID: -1029742972, guid: 702e3230b1367444d9d459f02db67668, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -155,3 +231,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: dcce6360d5c9e3447b2423e902e0c254, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  servant: {fileID: 0}
+  servantSkill:
+    name: 
+    disdescription: 
+    effectIndex: 0
+    value: 0
+    throwRange: 0
+    effectRange: 0
+    skillType: 0
+    Icon: {fileID: 0}
+  col: {fileID: 0}
+  image: {fileID: 0}
+  button: {fileID: 0}
+  speed: 25
+  atlasPath: ServentSkill/Sslx_Ui_SuiCong_JiNeng_v01

ColorlessWorld-2024-4-2/Assets/Resources/ServentSkill.meta

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

ColorlessWorld-2024-4-2/Assets/Resources/ServentSkill/Sslx_Ui_SuiCong_JiNeng_v01.png.meta

@@ -0,0 +1,193 @@
+fileFormatVersion: 2
+guid: 702e3230b1367444d9d459f02db67668
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  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
+  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: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  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
+    resizeAlgorithm: 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
+    resizeAlgorithm: 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
+    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:
+    - serializedVersion: 2
+      name: Sslx_Ui_SuiCong_JiNeng_v01_0
+      rect:
+        serializedVersion: 2
+        x: 177
+        y: 890
+        width: 412
+        height: 470
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 0c240186d2cd221478766433238a9162
+      internalID: -1029742972
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Sslx_Ui_SuiCong_JiNeng_v01_1
+      rect:
+        serializedVersion: 2
+        x: 626
+        y: 898
+        width: 413
+        height: 471
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 03b7d1281045d9448b3d448c8559210f
+      internalID: 1361041433
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: Sslx_Ui_SuiCong_JiNeng_v01_2
+      rect:
+        serializedVersion: 2
+        x: 1083
+        y: 900
+        width: 410
+        height: 469
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 4990e4961e102894fa3def86d14e8f34
+      internalID: 158022059
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 11dc4c26779b5ed4cb62e1dce85d70df
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      Sslx_Ui_SuiCong_JiNeng_v01_0: -1029742972
+      Sslx_Ui_SuiCong_JiNeng_v01_1: 1361041433
+      Sslx_Ui_SuiCong_JiNeng_v01_2: 158022059
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity

@@ -1314,7 +1314,7 @@ Canvas:
   m_VertexColorAlwaysGammaSpace: 0
   m_AdditionalShaderChannelsFlag: 0
   m_UpdateRectTransformForStandalone: 0
-  m_SortingLayerID: 801241541
+  m_SortingLayerID: 144399565
   m_SortingOrder: 0
   m_TargetDisplay: 0
 --- !u!1 &111044418
@@ -2663,6 +2663,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 1601223406}
   - {fileID: 1915587657}
   - {fileID: 469385439}
   - {fileID: 172253752}
@@ -3483,6 +3484,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 253958914}
   m_CullTransparentMesh: 1
+--- !u!1 &263233442
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 263233443}
+  - component: {fileID: 263233445}
+  - component: {fileID: 263233444}
+  m_Layer: 5
+  m_Name: TotalPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &263233443
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 263233442}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1601223406}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &263233444
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 263233442}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &263233445
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 263233442}
+  m_CullTransparentMesh: 1
 --- !u!1 &263387096
 GameObject:
   m_ObjectHideFlags: 0
@@ -4197,7 +4273,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -4466,13 +4542,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 330585543}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5646069, y: 0, z: 0, w: 0.82535994}
-  m_LocalPosition: {x: 5, y: 12.3, z: -2.2}
+  m_LocalRotation: {x: 0.5735764, y: 0, z: 0, w: 0.8191521}
+  m_LocalPosition: {x: 5, y: 10.4, z: -1.3}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 68.75, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 70, y: 0, z: 0}
 --- !u!114 &330585547
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4987,7 +5063,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -5067,11 +5143,11 @@ MonoBehaviour:
   m_Color: {r: 0, g: 0, b: 0, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: -959012317, guid: 922c3c65a6c19f94d8c3bdc7559825ef, type: 3}
+  m_Sprite: {fileID: 198574905, guid: e473e1367c7d7f141a660b4707dd6eb1, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -5142,7 +5218,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -5424,6 +5500,50 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 377674262}
   m_CullTransparentMesh: 1
+--- !u!1 &395072431
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 395072433}
+  - component: {fileID: 395072432}
+  m_Layer: 0
+  m_Name: ToolDontDestory
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &395072432
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 395072431}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d6f23279cbd0f954ca899908598a8505, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!4 &395072433
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 395072431}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 4.8241224, y: 1.0390644, z: 1.4156547}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &397884637
 GameObject:
   m_ObjectHideFlags: 0
@@ -8171,7 +8291,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   servantState: {fileID: 11400000, guid: 28fb39120070fbe46b1d96b7004b7b1b, type: 2}
-  servant: {fileID: 0}
+  servant: {fileID: 1202010108}
 --- !u!4 &515302569
 Transform:
   m_ObjectHideFlags: 0
@@ -8213,7 +8333,7 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 517249484}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalPosition: {x: 0, y: 0, z: 0.000000018078}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -8221,8 +8341,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.1094, y: -0}
-  m_SizeDelta: {x: 1.1434, y: 0.1244}
+  m_AnchoredPosition: {x: 0.12125, y: 0}
+  m_SizeDelta: {x: 1.1671, y: 0.1243}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &517249486
 MonoBehaviour:
@@ -8237,14 +8357,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0.23303296, b: 0.20943397, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1255180889, guid: fe1c308de7c89bc42a3777bfc18c8524, type: 3}
+  m_Sprite: {fileID: 336204301, guid: ae037ccfb7aae5344a3ac77b2145544b, type: 3}
   m_Type: 3
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -11500,7 +11620,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -12431,7 +12551,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 0}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
@@ -14193,8 +14313,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 2b2b8537b62d04d45ad201dafc853142, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  UIClick: {fileID: 8300000, guid: fbdba0f9a7b4f2d4ca75a2887c6d946a, type: 3}
-  AttackClick: {fileID: 8300000, guid: 0f2b6b8613f1f9045a7a158aff6132b0, type: 3}
+  UIClick: {fileID: 8300000, guid: 7f1f0990752c5374684514f002acaf1c, type: 3}
+  AttackClick: {fileID: 8300000, guid: dfb2db36b83c4d74f9505e29f70de74a, type: 3}
   UIClickSource: {fileID: 992566369}
   ActionSource: {fileID: 992566372}
 --- !u!4 &992566371
@@ -14344,6 +14464,7 @@ Transform:
   - {fileID: 1136505123}
   - {fileID: 1641369020}
   - {fileID: 410030164}
+  - {fileID: 1738904435}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1 &993436075
@@ -16232,7 +16353,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0.5224985, y: 0, z: 0, w: 0.8526402}
   m_LocalPosition: {x: 0, y: 0.34, z: 0.071}
-  m_LocalScale: {x: 0.1, y: 0.1, z: 0.1}
+  m_LocalScale: {x: 0.06, y: 0.06, z: 0.06}
   m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 1202010107}
@@ -16278,7 +16399,7 @@ SpriteRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
-  m_Sprite: {fileID: 550902225, guid: af9abe0369f120e4cbdc812259a861f9, type: 3}
+  m_Sprite: {fileID: -556281538, guid: 55e5d0c0b0b03a441b1566edc450b5b1, type: 3}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_FlipX: 0
   m_FlipY: 0
@@ -17249,7 +17370,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -17289,6 +17410,7 @@ GameObject:
   - component: {fileID: 1202010104}
   - component: {fileID: 1202010108}
   - component: {fileID: 1202010109}
+  - component: {fileID: 1202010110}
   m_Layer: 7
   m_Name: Servant
   m_TagString: Servant
@@ -17416,20 +17538,37 @@ MonoBehaviour:
   skillList:
   - name: move
     disdescription: "\u79FB\u52A8"
+    effectIndex: 0
     value: 3
     throwRange: 3
     effectRange: 1
     skillType: 4
-    IconPath: 
+    Icon: {fileID: -1029742972, guid: 702e3230b1367444d9d459f02db67668, type: 3}
   - name: shoot
     disdescription: "\u653B\u51FB\u529B\u4E0D\u9AD8\u7684\u666E\u901A\u5C04\u51FB"
+    effectIndex: 1
     value: 6
     throwRange: 5
     effectRange: 1
     skillType: 0
-    IconPath: 
+    Icon: {fileID: 158022059, guid: 702e3230b1367444d9d459f02db67668, type: 3}
+  - name: magic
+    disdescription: "\u67D3\u8272\u7684\u9B54\u6CD5"
+    effectIndex: 2
+    value: 6
+    throwRange: 3
+    effectRange: 1
+    skillType: 2
+    Icon: {fileID: 158022059, guid: 702e3230b1367444d9d459f02db67668, type: 3}
+  skillNodeList: []
+  skillUIPos: []
   SkillUIPrefab: {fileID: 7216391201375852461, guid: 3a10c2662334fdd459c890a6dba99b1a,
     type: 3}
+  radius: 0.6
+  angle: -45
+  startAngle: 0
+  pathNodeNum: 5
+  currentSkillInex: -1
 --- !u!114 &1202010109
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -17446,6 +17585,20 @@ MonoBehaviour:
   textCurrentHPdValue: {fileID: 365654902}
   textMaxHPValue: {fileID: 350066635}
   textShieldValue: {fileID: 762310626}
+--- !u!114 &1202010110
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1202010103}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d7f89d6a95cea3849b3ea899f72d31c1, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lineRenderer: {fileID: 0}
+  pointNum: 0
 --- !u!1 &1206243802
 GameObject:
   m_ObjectHideFlags: 0
@@ -20279,7 +20432,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1411570288
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -20326,17 +20479,17 @@ RectTransform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1411570287}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0.000000011885}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1533829698}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0.29759997}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 1, y: 1}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1411570291
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -20344,7 +20497,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1411570287}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
   m_Name: 
@@ -21222,7 +21375,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -22940,6 +23093,108 @@ Transform:
   - {fileID: 1612911700}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1601223405
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1601223406}
+  - component: {fileID: 1601223409}
+  - component: {fileID: 1601223408}
+  - component: {fileID: 1601223407}
+  m_Layer: 5
+  m_Name: UICanvasUnder
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1601223406
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1601223405}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 263233443}
+  m_Father: {fileID: 196188496}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &1601223407
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1601223405}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &1601223408
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1601223405}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0.5
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &1601223409
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1601223405}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 1
+  m_Camera: {fileID: 330585545}
+  m_PlaneDistance: 7
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: -2092445629
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
 --- !u!1 &1607684878
 GameObject:
   m_ObjectHideFlags: 0
@@ -24272,7 +24527,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -24807,6 +25062,90 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: -20, y: -20}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &1738904434
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1738904435}
+  - component: {fileID: 1738904436}
+  m_Layer: 0
+  m_Name: "\u4F01\u4E1A\u5FAE\u4FE1\u622A\u56FE_17270970911753"
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1738904435
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1738904434}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0.8191521, z: -0.5735764, w: 0}
+  m_LocalPosition: {x: 0.03, y: -1.8672, z: -1.3427}
+  m_LocalScale: {x: 1.415, y: 1.415, z: 1.415}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 993262479}
+  m_LocalEulerAnglesHint: {x: 70, y: 180, z: 0}
+--- !u!212 &1738904436
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1738904434}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: 21300000, guid: 48ef24ba9c4b2bf4e82e671e33eb713e, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 16.7, y: 9.29}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
 --- !u!1 &1740592867
 GameObject:
   m_ObjectHideFlags: 0
@@ -26081,7 +26420,7 @@ MonoBehaviour:
   m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 0
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
@@ -28141,7 +28480,7 @@ Canvas:
   serializedVersion: 3
   m_RenderMode: 1
   m_Camera: {fileID: 330585545}
-  m_PlaneDistance: 10
+  m_PlaneDistance: 7
   m_PixelPerfect: 0
   m_ReceivesEvents: 1
   m_OverrideSorting: 0
@@ -32466,3 +32805,4 @@ SceneRoots:
   - {fileID: 1690695890}
   - {fileID: 515302569}
   - {fileID: 992566371}
+  - {fileID: 395072433}

ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowLineManager.cs

@@ -49,7 +49,7 @@ public class ArrowLineManager : MonoBehaviour
         //Debug.Log(controlPoints[0]);
         //p3是鼠标位置-------鼠标在ui平面上的位置
 
-        Vector3 position = new Vector3(Input.mousePosition.x, Input.mousePosition.y, 10f);
+        Vector3 position = new Vector3(Input.mousePosition.x, Input.mousePosition.y, 7f);
         Vector3 worldPoint = Camera.main.ScreenToWorldPoint(position);
         Vector3 localPoint = transform.InverseTransformPoint(worldPoint);
         this.controlPoints[3] = new Vector2(localPoint.x, localPoint.y);

ColorlessWorld-2024-4-2/Assets/Scripts/Card/Arrow/ArrowManager.cs

@@ -46,7 +46,7 @@ public class ArrowManager : MonoBehaviour
         //Debug.Log(controlPoints[0]);
         //p3是鼠标位置-------鼠标在ui平面上的位置
 
-        Vector3 position = new Vector3(Input.mousePosition.x, Input.mousePosition.y, 10f);
+        Vector3 position = new Vector3(Input.mousePosition.x, Input.mousePosition.y, 7f);
         Vector3 worldPoint = Camera.main.ScreenToWorldPoint(position);
         Vector3 localPoint = transform.InverseTransformPoint(worldPoint);
         this.controlPoints[3] = new Vector2(localPoint .x,localPoint .y);

ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs

@@ -212,7 +212,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                     //  Debug.Log(transform.position);
                     //  Debug.Log(eventData.position);
                     //  transform.position = eventData.position;
-                    Vector3 eventDataWorld = CardActiveSort.Instance.ScreenPointToWorldPoint(eventData.position, 10f);
+                    Vector3 eventDataWorld = CardActiveSort.Instance.ScreenPointToWorldPoint(eventData.position, 7f);
                     transform.position = eventDataWorld;
                 }
             }

ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs

@@ -80,6 +80,10 @@ public class TurnMaster : Singleton<TurnMaster>
             MapUnitySettleManager.Instance.MapGridsSettle();
             //恢复体力
             GameManager.Instance.playerState.currentStepRange = Usermanager.Instance.StepRangeCalculation(GameManager.Instance.playerState.maxStepRange);
+            //恢复随从体力
+            RecoverServantResource();
+            
+
             //显示敌人攻击虚线
             EnemyManager.Instance.EnemyLine_Observer();
             //回复敌人系数
@@ -97,7 +101,8 @@ public class TurnMaster : Singleton<TurnMaster>
         {
             //广播遗物接口
             LegacyManager.Instance.BroadCastSettleInPlayerTurnEnd();
-
+            //关闭随从的技能UI板
+            CloseSkillUI();
             //回合结束结算玩家buff
             Usermanager.Instance.PlayerTurnSettle();
             //结算敌人护盾
@@ -172,6 +177,16 @@ public class TurnMaster : Singleton<TurnMaster>
         turn = Turn.enemyTurnEnd;
     }
 
+    //随从
+    public void RecoverServantResource()
+    {
+        GameManager.Instance.servantState.currentStepRange = GameManager.Instance.servantState.maxStepRange;
+    }
+    public void CloseSkillUI()
+    {
+        ServentStateManager.Instance.servant .SkillUI.SetActive(false);
+    }
+
     //老吊写的函数
     public void restoreResource(int settleTurn)
     {

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs

@@ -78,19 +78,6 @@ public class LegacyManager : Singleton <LegacyManager>
            relicsDictionary.Add(values[1], currentRelictData);
         }
     }
-    public Sprite LoadImage(string imagePath)
-    {
-
-        if (imagePath != null)
-        {
-            Sprite sprite = Resources.Load<Sprite>(imagePath);
-            if (sprite != null)
-            {
-                return sprite;
-            }
-        }
-        return null;
-    }
 
     //鯤소쀼북역迦
     public event Action settleInPlayerTurnBegin;

ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyNode.cs

@@ -17,7 +17,7 @@ public class LegacyNode : MonoBehaviour
         List<string> relicData = LegacyManager.Instance.relicsDictionary[className];
         name = relicData[3];
         className = relicData[1];
-        image = LegacyManager.Instance.LoadImage(relicData[2]);
+        image = ToolDontDestory.Instance.LoadImage(relicData[2]);
         GetComponent<Image>().sprite = image;
 
         if(isOnGet )

ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs

@@ -94,9 +94,6 @@ public class Player : MonoBehaviour
 
             MapUnity mapNode = raycastHit.collider.transform.GetComponent<MapUnity>();
 
-            //¸Ä±äËõ·Å·­×ª
-            FlipLocalScale(raycastHit.point);
-
             //角色移动
             if (mapNode .influenced &&mapNode .blocked ==false &&mapNode .enemyNode ==null&& mapNode.playerOn == false )
             {
@@ -108,7 +105,8 @@ public class Player : MonoBehaviour
                     Debug.Log("不能移动到该位置");
                     yield break;
                 }
-
+                //¸Ä±äËõ·Å·­×ª
+                FlipLocalScale(raycastHit.point);
                 //改变动画
                 anim.SetBool("move", true);
 

ColorlessWorld-2024-4-2/Assets/Scripts/Servent/KindOfServent/ServantBottleCat.cs

@@ -41,11 +41,25 @@ public class ServantBottleCat : Servant
     }
     public void PreEffect_1()
     {   
-        MovePreView();
+        influencePreviewPool.UnionWith(MapUnityManager.Instance.findReachableTiles(GameManager.Instance.servantOn,skillList [currentSkillInex].throwRange ));
+        //±éÀúÓ°Ïì³Ø±äÉ«
+        foreach (MapUnity mapUnity in influencePreviewPool)
+        {
+            mapUnity.influenced = true;
+            mapUnity.choossedMark.GetComponent<Renderer>().material = mapUnity.red;
+        }  
+        TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill;
     }
     public void PreEffect_2()
     {
-
+        influencePreviewPool.UnionWith(MapUnityManager.Instance.findReachableTiles(GameManager.Instance.servantOn, skillList[currentSkillInex].throwRange));
+        //±éÀúÓ°Ïì³Ø±äÉ«
+        foreach (MapUnity mapUnity in influencePreviewPool)
+        {
+            mapUnity.influenced = true;
+            mapUnity.choossedMark.GetComponent<Renderer>().material = mapUnity.red;
+        }
+        TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill;
     }
     public void Effect_0()
     {
@@ -56,6 +70,7 @@ public class ServantBottleCat : Servant
         Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);
         if (Physics.Raycast(ray, out RaycastHit raycastHit, 500,chooseNodeLayerMask.value))
         {
+            Debug.Log(raycastHit.collider.name);
             MapUnity currentNode = raycastHit.transform.GetComponent<MapUnity>();
             if (currentNode.enemyNode != null )
             {
@@ -67,6 +82,18 @@ public class ServantBottleCat : Servant
     }
     public void Effect_2()
     {
+        Ray ray = Camera.main.ScreenPointToRay(Mouse.current.position.value);
+        if (Physics.Raycast(ray, out RaycastHit raycastHit, 500, chooseNodeLayerMask.value))
+        {
+            Debug.Log(raycastHit.collider.name);
+            MapUnity currentNode = raycastHit.transform.GetComponent<MapUnity>();
+            List <MapUnity > path = AStarManager.Instance.FindPathWithEndNode(GameManager.Instance.servantOn, currentNode);
+            foreach (var node in path )
+            {
+                node.whoColour = MapUnity.WhoColour.playerColour;
+            }
 
+        }
+        ResetPreView();
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Servent/Servant.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
 using UnityEngine.InputSystem;
 using UnityEngine.Playables;
@@ -30,9 +31,16 @@ public class Servant : MonoBehaviour
     [Header("技能UI列表（UI）")]
     public GameObject SkillUI;
     public List<ServantSkill> skillList = new List<ServantSkill>();
+    public List<ServantSkillNode> skillNodeList = new List<ServantSkillNode>();
+    public List<Vector3> skillUIPos = new List<Vector3>();
 
     [Header("技能UI生成资源")]
     public GameObject SkillUIPrefab;
+    [Header("技能UI生成参数")]
+    public float radius;
+    public float angle;
+    public float startAngle;
+    public int pathNodeNum;
 
     [Header("当前处于哪个技能的范围预览")]
     public int currentSkillInex;
@@ -52,7 +60,8 @@ public class Servant : MonoBehaviour
     }
     public void Update()
     {
-        if (Mouse.current.leftButton.wasReleasedThisFrame && TurnMaster.Instance.playerAction != TurnMaster.PlayerAction.useCard && TurnMaster.Instance.servantAction != TurnMaster.ServantAction.banAction&& TurnMaster.Instance.servantAction != TurnMaster.ServantAction.useSkill)
+       
+        if (Mouse.current.leftButton.wasReleasedThisFrame && TurnMaster.Instance.playerAction != TurnMaster.PlayerAction.useCard && TurnMaster.Instance.servantAction != TurnMaster.ServantAction.banAction)
         {
             //if (GameManager.Instance.servantState.currentStepRange > 0 && !Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.banStep))
             
@@ -66,22 +75,24 @@ public class Servant : MonoBehaviour
                         Debug.Log(raycastHit.collider.gameObject.name);
 
                         //展开技能表
-                        SkillUI.SetActive(!SkillUI.activeInHierarchy);
+                        ShowSkillUI();
                     }
                     else if (raycastHit.collider.gameObject.tag == "ServantSkillUI")//检测到是技能
                     {
                         GameManager.Instance.character = GameManager.SelectedCharacter.servant;
                         TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill;
-                      //技能范围预览(目前是button触发)
-                      //MovePreView();
-                     SkillePreviewSelector(currentSkillInex);
-                }
-                    else
+                        //技能范围预览(目前是button触发)
+                        //MovePreView();
+                        SkillePreviewSelector(currentSkillInex);
+                         ColorInUseSkillUI();
+                    }
+                    else if (Physics.Raycast(ray, out RaycastHit raycastHitMap, 500, chooseNodeLayerMask .value))
                     {
                         //检测到地面，释放技能实际效果
-                        if (GameManager.Instance.character == GameManager.SelectedCharacter.servant)
+                        if (GameManager.Instance.character == GameManager.SelectedCharacter.servant&& TurnMaster.Instance.servantAction == TurnMaster.ServantAction.useSkill)
                         {
-                          SkilleEffectSelector(currentSkillInex);
+                           SkilleEffectSelector(currentSkillInex);
+                           ColorResrtUseSkillUI();
                         }        
                     }
                 }
@@ -117,16 +128,65 @@ public class Servant : MonoBehaviour
     public virtual void SkilleEffectSelector(int index)
     {
 
+    }
+    //展开技能表
+    public void ShowSkillUI()
+    {
+        if (SkillUI.activeInHierarchy == false)
+        {
+            SkillUI.SetActive(true);
+            foreach (var skill in skillNodeList)
+            {
+                skill.StopAllCoroutines();
+                skill.transform.localPosition = new Vector3(0, 1, 0);
+                skill.StartCoroutine(skill.GoDistination());
+            }
+           
+        }
+        else
+        {
+            SkillUI.SetActive(false);
+        }
+       
+    }
+    //半透明技能UI
+    public void ColorInUseSkillUI()
+    {
+        foreach (var skillNode in skillNodeList )
+        {
+            skillNode.UIInUseSkill();
+        }
+    }
+    //恢复半透明技能UI
+    public void ColorResrtUseSkillUI()
+    {
+        foreach (var skillNode in skillNodeList)
+        {
+            skillNode.UIResetUseSkill();
+        }
     }
     //生成技能UI
     public void InstantiateSkillUI()
     {
+
         for(int i=0;i<skillList .Count;i++)
         {
             var currentUI = Instantiate(SkillUIPrefab, SkillUI.transform);
             ServantSkillNode servantSkillNode = currentUI.GetComponent<ServantSkillNode>();
             servantSkillNode.servantSkill = skillList[i];
             servantSkillNode.servant = this;
+            skillNodeList.Add(servantSkillNode);
+
+            //每个角度分五个节点
+            for(int a=1;a<=pathNodeNum ;a ++)
+            {
+                float currentAngle = startAngle + angle * (i - 1) + a * angle / (float)pathNodeNum;
+                Debug.Log(currentAngle);
+                // currentUI.transform.localPosition = new Vector3(radius * Mathf.Sin(currentAngle * Mathf.Deg2Rad), radius * (1 - Mathf.Cos(currentAngle * Mathf.Deg2Rad)), 0);
+                //currentUI.transform.localEulerAngles -= SkillUI.transform.localEulerAngles;//矫正角度
+                skillUIPos.Add(new Vector3(radius * Mathf.Sin(currentAngle * Mathf.Deg2Rad), radius * (1 + Mathf.Cos(currentAngle * Mathf.Deg2Rad)), 0));
+            }
+            
         }
        
     }
@@ -136,6 +196,8 @@ public class Servant : MonoBehaviour
         // StepPreviewInfluencedNode(step);
         CloseStepPreviewInfluencedNode();//取消格子预览
 
+        ColorResrtUseSkillUI();//恢复技能UI
+
         if (TurnMaster.Instance.servantAction != TurnMaster.ServantAction.banAction)
             TurnMaster.Instance.servantAction = TurnMaster.ServantAction.none;
     }
@@ -150,7 +212,8 @@ public class Servant : MonoBehaviour
             mapUnity.choossedMark.GetComponent<Renderer>().material = mapUnity.red;
         }
         //StepPreviewInfluencedNode(GameManager.Instance.playerState.currentStepRange);
-        TurnMaster.Instance.servantAction = TurnMaster.ServantAction.move;
+        //TurnMaster.Instance.servantAction = TurnMaster.ServantAction.move;
+        TurnMaster.Instance.servantAction = TurnMaster.ServantAction.useSkill;
     }
     public IEnumerator MoveToChooseNode()//射线检测选择一个mapNode
     {
@@ -280,7 +343,6 @@ public class Servant : MonoBehaviour
             move,
             noneRange
         }
-
-        public string IconPath;
+        public Sprite Icon;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ArrowInMap.cs

@@ -0,0 +1,10 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ArrowInMap : MonoBehaviour
+{
+    public LineRenderer lineRenderer;
+    public int pointNum;
+
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ArrowInMap.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Servent/ServantSkill/ServantSkillNode.cs

@@ -8,9 +8,22 @@ public class ServantSkillNode : MonoBehaviour
 {
     public Servant servant;
     public Servant.ServantSkill servantSkill;
+
+    public Collider col;
+    public Image image;
+    public Button button;
+
+    public float speed;
+
+    public string atlasPath;
     private void Start()
     {
-       GetComponent<Button>().onClick.AddListener(PreEffect);
+        button = GetComponent<Button>();
+        button.onClick.AddListener(PreEffect);
+
+        col = GetComponent<BoxCollider>();
+        image = GetComponent<Image>();
+        image.sprite = servantSkill .Icon ;
     }
    
     public void PreEffect()
@@ -19,4 +32,48 @@ public class ServantSkillNode : MonoBehaviour
        // servant.SkillePreviewSelector(servantSkill.effectIndex);
     }
    
+    public void UIInUseSkill()
+    {
+        col.enabled = false;
+        button.enabled = false;
+        if(servant .currentSkillInex != servantSkill .effectIndex )
+        {
+            image.color = new Color(128f, 128f, 128f, 0.5f);
+        }
+        else
+        {
+            image.color = new Color(225f, 225f, 225f, 1f);
+        }
+    }
+    public void UIResetUseSkill()
+    {
+        col.enabled = true;
+        button.enabled = true;
+        image.color = new Color(225f, 225f, 225f, 1f);
+        servant. CloseStepPreviewInfluencedNode();//È¡Ïû¸ñ×ÓÔ¤ÀÀ
+    }
+
+    public IEnumerator GoDistination()
+    {
+        //int startIndex = servantSkill.effectIndex * servant.pathNodeNum;
+        transform.localPosition = servant.skillUIPos[servant.pathNodeNum-1];
+        for (int i= servant.pathNodeNum; i<(servantSkill.effectIndex+1) * servant.pathNodeNum ; i++)
+        {
+            Vector3 startPos = transform.localPosition;
+            float time = 0;
+            bool go = true;
+            while (go)
+            {
+                transform.localPosition = Vector3.Lerp(startPos, servant.skillUIPos[i], time += Time.deltaTime * speed);
+
+                if (Vector3.Distance(transform.localPosition, servant.skillUIPos[i]) <= 0.01f)
+                {
+                    transform.localPosition = servant.skillUIPos[i];
+                    go = false;
+                }
+                yield return null;
+            }
+            
+        }
+    }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/ToolDontDestory.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.U2D;
+
+public class ToolDontDestory : Singleton <ToolDontDestory >
+{
+    private void Start()
+    {
+        DontDestroyOnLoad(this.gameObject);
+    }
+
+    public Sprite LoadImage(string imagePath)
+    {
+
+        if (imagePath != null)
+        {
+            Sprite sprite = Resources.Load<Sprite>(imagePath);
+            if (sprite != null)
+            {
+                return sprite;
+            }
+        }
+        return null;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Tool/ToolDontDestory.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs

@@ -67,7 +67,7 @@ public class EnemyUIBar : MonoBehaviour
           EnemyManager.Instance.speedText.text = enemyState.speed.ToString();
         */
 
-        if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn && GameManager.Instance.onDrag == false)
+        if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn && GameManager.Instance.onDrag == false && TurnMaster.Instance.servantAction != TurnMaster.ServantAction.useSkill)
         {
 
             MapUnity currentMapUnity = GameManager.Instance.X[enemyNode.positionX].Y[enemyNode.positionY];

ColorlessWorld-2024-4-2/ProjectSettings/TagManager.asset

@@ -51,12 +51,15 @@ TagManager:
   - name: Default
     uniqueID: 0
     locked: 0
+  - name: TotalPanle
+    uniqueID: 2202521667
+    locked: 0
+  - name: ServantSkillUI
+    uniqueID: 144399565
+    locked: 0
   - name: MainUI
     uniqueID: 1637390125
     locked: 0
   - name: CardUI
     uniqueID: 3099584011
     locked: 0
-  - name: ServantSkillUI
-    uniqueID: 144399565
-    locked: 0