合并冲突0612

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset

@@ -29,7 +29,7 @@ MonoBehaviour:
   currentSkillCoolDown: 3
   damageMultiplier: 1
   damage: 7
-  attackRange: 5
+  attackRange: 3
   aoeRange: 2
   maxNumberOfHits: 0
   currentNumberOfHits: 0

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset

@@ -29,7 +29,7 @@ MonoBehaviour:
   currentSkillCoolDown: 3
   damageMultiplier: 1
   damage: 0
-  attackRange: 6
+  attackRange: 3
   aoeRange: 0
   maxNumberOfHits: 0
   currentNumberOfHits: 0

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/FailedSample.asset

@@ -14,7 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyName: BoundSoul
   enemyIcon: {fileID: 21300000, guid: bd8f3094e7ef01148bddd857e065ebc3, type: 3}
-  stepRange: 4
+  stepRange: 3
   stepRangeMultiplier: 1
   speed: 4
   maxMoveCoolDown: 0

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Leviathan.asset

@@ -29,7 +29,7 @@ MonoBehaviour:
   currentSkillCoolDown: 3
   damageMultiplier: 1
   damage: 25
-  attackRange: 4
+  attackRange: 3
   aoeRange: 2
   maxNumberOfHits: 0
   currentNumberOfHits: 0

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pharmacist.asset

@@ -29,7 +29,7 @@ MonoBehaviour:
   currentSkillCoolDown: 3
   damageMultiplier: 1
   damage: 10
-  attackRange: 6
+  attackRange: 4
   aoeRange: 0
   maxNumberOfHits: 0
   currentNumberOfHits: 0

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pollutinel.asset

@@ -29,7 +29,7 @@ MonoBehaviour:
   currentSkillCoolDown: 3
   damageMultiplier: 1
   damage: 8
-  attackRange: 4
+  attackRange: 3
   aoeRange: 2
   maxNumberOfHits: 0
   currentNumberOfHits: 0

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/PollutionSpreader.asset

@@ -29,7 +29,7 @@ MonoBehaviour:
   currentSkillCoolDown: 3
   damageMultiplier: 1
   damage: 4
-  attackRange: 4
+  attackRange: 3
   aoeRange: 2
   maxNumberOfHits: 0
   currentNumberOfHits: 0

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/RatWarrior.asset

@@ -14,7 +14,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   enemyName: RatWarrior
   enemyIcon: {fileID: 21300000, guid: bd8f3094e7ef01148bddd857e065ebc3, type: 3}
-  stepRange: 4
+  stepRange: 3
   stepRangeMultiplier: 1
   speed: 3
   maxMoveCoolDown: 0

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/ReconnaissanceBee.asset

@@ -29,7 +29,7 @@ MonoBehaviour:
   currentSkillCoolDown: 3
   damageMultiplier: 1
   damage: 5
-  attackRange: 4
+  attackRange: 2
   aoeRange: 0
   maxNumberOfHits: 0
   currentNumberOfHits: 0

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/SoulMaker.asset

@@ -29,7 +29,7 @@ MonoBehaviour:
   currentSkillCoolDown: 3
   damageMultiplier: 1
   damage: 8
-  attackRange: 4
+  attackRange: 2
   aoeRange: 0
   maxNumberOfHits: 0
   currentNumberOfHits: 0

ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon/Monster.png.meta

@@ -0,0 +1,149 @@
+fileFormatVersion: 2
+guid: c70cfc2f90b367447a1d47fe4aecffa7
+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:
+    - serializedVersion: 2
+      name: Monster_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 256
+        height: 256
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 4219d2a15bf5e7d40b61af5a9e124261
+      internalID: -143651760
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      Monster_0: -143651760
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Armor.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: bc9464a38a392104a9e7eb4c40d35fbf
+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/Resources/BuffIcon_v02/CantShield.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 6f2132dce0b5ad24ea93f3509069b833
+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/Resources/BuffIcon_v02/Monster.png.meta

@@ -0,0 +1,149 @@
+fileFormatVersion: 2
+guid: 4ebe85f56bcdd0842ad879e9ee886e14
+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:
+    - serializedVersion: 2
+      name: Monster_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 256
+        height: 256
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 4219d2a15bf5e7d40b61af5a9e124261
+      internalID: -143651760
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      Monster_0: -143651760
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/Shedding.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 36868da9f8aaa63438d2307bfe429010
+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/Resources/BuffIcon_v02/StoneSkin.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 3586e5bd352042841a140d070fa2ab06
+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/Resources/BuffIcon_v02/血疗.jpg.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: e4fafd1d73d62f345a69cb10e0c31826
+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/Resources/BuffIcon_v02/赋能.jpg.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 1094c69b678619546952c4c9f14bb14b
+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/Scenes/SampleScene.unity

@@ -53759,7 +53759,11 @@ MonoBehaviour:
   generatePoint: {fileID: 514899946}
   lineOffSet: {x: 1.43, y: 0, z: 0}
   columnOffSet: {x: 0, y: 0, z: 0.86}
-  enemyGenerateDataList: []
+  enemyGenerateDataList:
+  - enemyPrefab: {fileID: 1253231568001379261, guid: a3234acb1bf506e4ba6a68d9c87bb537,
+      type: 3}
+    locationX: 3
+    locationY: 3
   mapUnityFather: {fileID: 471426433}
   playerNameText: {fileID: 1103775266}
   cardDeckNumberText: {fileID: 1577863296}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_AcidRain.cs

@@ -24,7 +24,7 @@ public class Buff_AcidRain : Buff
     {
         Buff buff = new Buff_AcidRain();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Armor.cs

@@ -22,7 +22,7 @@ public class Buff_Armor :  Buff
     {
         Buff buff = new Buff_Armor();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "fireseed");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Armor");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed3TurnCost.cs

@@ -21,7 +21,7 @@ public class Buff_Bleed3TurnCost : Buff
     {
         Buff buff = new Buff_Bleed3TurnCost();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "赋能");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Bleed4TurnCost.cs

@@ -22,7 +22,7 @@ public class Buff_Bleed4TurnCost : Buff
     {
         Buff buff = new Buff_Bleed4TurnCost();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "赋能");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BleedHeal.cs

@@ -24,7 +24,7 @@ public class Buff_BleedHeal : Buff
     {
         Buff buff = new Buff_BleedHeal();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "ѪÁÆ");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoundSoul.cs

@@ -24,7 +24,7 @@ public class Buff_BoundSoul : Buff
     {
         Buff buff = new Buff_BoundSoul();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_CantShield.cs

@@ -20,7 +20,7 @@ public class Buff_CantShield : Buff
     {
         Buff buff = new Buff_CantShield();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "CantShield");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ContaminatusImmortalis.cs

@@ -24,7 +24,7 @@ public class Buff_ContaminatusImmortalis : Buff
     {
         Buff buff = new Buff_ContaminatusImmortalis();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FailedSample.cs

@@ -24,7 +24,7 @@ public class Buff_FailedSample : Buff
     {
         Buff buff = new Buff_FailedSample();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_LivingArmor.cs

@@ -24,7 +24,7 @@ public class Buff_LivingArmor : Buff
     {
         Buff buff = new Buff_LivingArmor();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Pharmacist.cs

@@ -24,7 +24,7 @@ public class Buff_Pharmacist : Buff
     {
         Buff buff = new Buff_Pharmacist();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PollutionSpreader.cs

@@ -24,7 +24,7 @@ public class Buff_PollutionSpreader : Buff
     {
         Buff buff = new Buff_PollutionSpreader();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PrismReflector.cs

@@ -24,7 +24,7 @@ public class Buff_PrismReflector : Buff
     {
         Buff buff = new Buff_PrismReflector();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_RatWarrior.cs

@@ -24,7 +24,7 @@ public class Buff_RatWarrior : Buff
     {
         Buff buff = new Buff_RatWarrior();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ReconnaissanceBee.cs

@@ -24,7 +24,7 @@ public class Buff_ReconnaissanceBee : Buff
     {
         Buff buff = new Buff_ReconnaissanceBee();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Disabled");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Shedding.cs

@@ -22,7 +22,7 @@ public class Buff_Shedding : Buff
     {
         Buff buff = new Buff_Shedding();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "fireseed");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Shedding");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_SoulMaker.cs

@@ -24,7 +24,7 @@ public class Buff_SoulMaker : Buff
     {
         Buff buff = new Buff_SoulMaker();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StonePillar.cs

@@ -24,7 +24,7 @@ public class Buff_StonePillar : Buff
     {
         Buff buff = new Buff_StonePillar();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StoneSkin.cs

@@ -24,7 +24,7 @@ public class Buff_StoneSkin : Buff
     {
         Buff buff = new Buff_StoneSkin();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "StoneSkin");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Thief.cs

@@ -24,7 +24,7 @@ public class Buff_Thief : Buff
     {
         Buff buff = new Buff_Thief();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Twinbee.cs

@@ -24,7 +24,7 @@ public class Buff_Twinbee : Buff
     {
         Buff buff = new Buff_Twinbee();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "TwinBee");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Monster");
         return buff;
     }
 }

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

@@ -51,7 +51,9 @@ public class MapManager : Singleton<MapManager>
     {
         // StartCoroutine (starttest());//樓婥華輸雄賒
         //羲宎樓婥華輸
-        StartCoroutine(GenerateProcess());
+        
+        
+;        StartCoroutine(GenerateProcess());
 
         SetUpScenceInfor();
     }
@@ -182,9 +184,11 @@ public class MapManager : Singleton<MapManager>
        // yield return StartCoroutine(UPMoveMapUnity());
        // yield return new WaitForSeconds(2);
         yield return StartCoroutine(GenerateItem()); 
+        yield return StartCoroutine(PlayerGenerate());
         yield return StartCoroutine(EnemyGenerate());
        // yield return StartCoroutine(GenerateMask());
         yield return StartCoroutine(CompleteGenerate());
+        
     }
     IEnumerator GenerateMask()
     {
@@ -254,16 +258,28 @@ public class MapManager : Singleton<MapManager>
     {
        // yield return StartCoroutine(EnemyGenerate());
         yield return new WaitForSeconds(0.1f);
-        GameManager.Instance.player.StartPlayer();
+        //GameManager.Instance.player.StartPlayer();
         GameManager.Instance.complete = true;
 
         EnemyManager.Instance.SpeedSortList();
         EnemyManager.Instance.EnemySortIconGnerate();
 
+    }
+
+    IEnumerator PlayerGenerate()
+    {
+        // yield return StartCoroutine(EnemyGenerate());
+        GameManager.Instance.player.StartPlayer();
+        yield return null;
+
     }
     IEnumerator EnemyGenerate()
     {
         // yield return StartCoroutine(SetUpMapUnity());
+        if (GameManager.Instance.playerOn != null)
+        {
+            Debug.Log("playerÔÚ" + GameManager.Instance.playerOn);
+        }
         foreach (var enemy in enemyGenerateDataList)
         {
             var currentEnemy = Instantiate(enemy.enemyPrefab, getNodeTools.LocationToGetNode(enemy.locationX,enemy.locationY).transform.position, enemy.enemyPrefab.transform.rotation);
@@ -295,11 +311,33 @@ public class MapManager : Singleton<MapManager>
        
         List<GameObject> enemyPrefabList = EnemyPool.getEnemyPrefab(enemyList);
 
-        HashSet<MapUnity> allCanUseNode = getNodeTools.getAllCanUseNode();
+        HashSet<MapUnity> allCanUseNode = new HashSet<MapUnity>();
+        //allCanUseNode = getNodeTools.getAllCanUseNode();
         if (enemyPrefabList.Count > 0)
         {
             foreach (var enemyPrefab in enemyPrefabList)
             {
+                if (enemyPrefab.GetComponent<EnemyNode>().enemyScript.Equals(EnemyNode.EnemyScript.StonePillar))
+                {
+                    allCanUseNode = getNodeTools.getAllCanUseNode();
+                }
+                else if (enemyPrefab.GetComponent<EnemyNode>().templateEnemyState.attackRange==1) 
+                {
+                    HashSet<MapUnity> meleeList = new HashSet<MapUnity>();
+                    //Dictionary<MapUnity, int> endNodeMapUnityMap = new Dictionary<MapUnity, int>();
+                    meleeList.Add(GameManager.Instance.playerOn);
+                    getNodeTools.getArcNode(meleeList, 5);
+                    allCanUseNode=meleeList;
+                }
+                else if (enemyPrefab.GetComponent<EnemyNode>().templateEnemyState.attackRange > 1)
+                {
+                    HashSet<MapUnity> meleeList = new HashSet<MapUnity>();
+                    //Dictionary<MapUnity, int> endNodeMapUnityMap = new Dictionary<MapUnity, int>();
+                    meleeList.Add(GameManager.Instance.playerOn);
+                    getNodeTools.getArcNode(meleeList, 7);
+                    allCanUseNode = meleeList;
+                }
+                Debug.Log("EnemyNode³É¹¦"+ enemyPrefab.GetComponent<EnemyNode>().enemyScript);
                 MapUnity currentMapUnity = allCanUseNode.ElementAt(Random.Range(0, allCanUseNode.Count));
                 var currentEnemy = Instantiate(enemyPrefab, currentMapUnity.transform.position, enemyPrefab.transform.rotation);
                 EnemyNode enemynode = currentEnemy.GetComponent<EnemyNode>();

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

@@ -468,7 +468,7 @@ public class getNodeTools
         nodeList.UnionWith(mapUnityList);
     }
 
-
+    //데홀뒈욥
     public static void getArcNode(HashSet<MapUnity> nodeList, int range)
     {
         HashSet<MapUnity> smallCircleNodeSet=new HashSet<MapUnity>(nodeList);

ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs

@@ -131,7 +131,7 @@ public class BuffDataManager : Singleton<BuffDataManager>
             case AbnormalCondition.Buff_FailedSample:
                 return "不稳定：如果回合结束时候在不污染地块，随机获得一种减益";
             case AbnormalCondition.Buff_Pharmacist:
-                return ":回合结束时，移除其他怪物（除自身外）的一个减益效果，每移除一层，随机造成怪物周围一处污染";
+                return "回合结束时，移除其他怪物（除自身外）的一个减益效果，每移除一层，随机造成怪物周围一处污染";
             case AbnormalCondition.Buff_RatWarrior:
                 return "生命值越低伤害越低";
             case AbnormalCondition.Buff_LivingArmor:
@@ -144,6 +144,8 @@ public class BuffDataManager : Singleton<BuffDataManager>
                 return "每收到一次攻击，污染周围一圈地块";
             case AbnormalCondition.Buff_StonePillar:
                 return "被破坏后，减少巨兽一层石肤";
+            case AbnormalCondition.stoneSkin:
+                return "石肤:每层减少20%收到的伤害";
             case AbnormalCondition.acidRain:
                 return "每次收到攻击，随机污染3格玩家地块";
             case AbnormalCondition.halfDamageInBlack: