新放置物品和金属地块

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

@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 20f70984b262f8d4382bf5262dddb83e, type: 3}
+  m_Name: TNTBurket
+  m_EditorClassIdentifier: 
+  enemyName: 
+  enemyIcon: {fileID: 0}
+  stepRange: 0
+  stepRangeMultiplier: 1
+  speed: 0
+  maxMoveCoolDown: 0
+  currentMoveCoolDown: 0
+  shieldValue: 0
+  upShieldValue: 0
+  maxHP: 1000
+  currentHP: 1000
+  sufferDamageMultiply: 0
+  colourType: 0
+  maxSkillCoolDown: 0
+  currentSkillCoolDown: 0
+  damageMultiplier: 1
+  damage: 0
+  attackRange: 0
+  aoeRange: 0
+  maxNumberOfHits: 1
+  currentNumberOfHits: 1

ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/TNTBurket.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5630b3d7678ebcc43857b91620b17739
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Image/2D新场景/临时地面/未命名作品(12).png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 68336e7c47cff7f41ba97c5c23aba342
+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/Materials/Map/BlackMap-1 1.mat

@@ -41,7 +41,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: 50906b8df6defd5459f699624329e177, type: 3}
+        m_Texture: {fileID: 2800000, guid: 31cbca8da65b27644a8efe3265badef8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -65,7 +65,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 50906b8df6defd5459f699624329e177, type: 3}
+        m_Texture: {fileID: 2800000, guid: 31cbca8da65b27644a8efe3265badef8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-3 1.mat

@@ -41,7 +41,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: 8ee6f5ba282d99743a1f6fbd6d4bd534, type: 3}
+        m_Texture: {fileID: 2800000, guid: c03bed53209a8b54bbcd5bd32cba33f9, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -65,7 +65,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 8ee6f5ba282d99743a1f6fbd6d4bd534, type: 3}
+        m_Texture: {fileID: 2800000, guid: c03bed53209a8b54bbcd5bd32cba33f9, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

ColorlessWorld-2024-4-2/Assets/Materials/Map/GlassMap-5 1.mat

@@ -28,7 +28,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: c7bc96c66c601d44ea8ed05e8c9ff345, type: 3}
+        m_Texture: {fileID: 2800000, guid: 304c5dc11e4d42148ade3003da734f9d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -52,7 +52,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: c7bc96c66c601d44ea8ed05e8c9ff345, type: 3}
+        m_Texture: {fileID: 2800000, guid: 304c5dc11e4d42148ade3003da734f9d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

ColorlessWorld-2024-4-2/Assets/Materials/Map/NewMapTex.meta

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

ColorlessWorld-2024-4-2/Assets/Materials/Map/NewMapTex/1.meta

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

ColorlessWorld-2024-4-2/Assets/Materials/Map/NewMapTex/2.meta

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

ColorlessWorld-2024-4-2/Assets/Materials/Map/NewMapTex/2/black.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 31cbca8da65b27644a8efe3265badef8
+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/Materials/Map/NewMapTex/2/fire.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: c03bed53209a8b54bbcd5bd32cba33f9
+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/Materials/Map/NewMapTex/2/glass.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 304c5dc11e4d42148ade3003da734f9d
+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/Materials/Map/NewMapTex/2/whater.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 105cb24fba0ab0848a51b96b471a76a6
+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/Materials/Map/NewMapTex/2/white.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 07d1e190dd150524083eb22239dbab4d
+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/Materials/Map/WaterMap-2 1.mat

@@ -41,7 +41,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: a2383a7bc4d0315429fc78b261c9936e, type: 3}
+        m_Texture: {fileID: 2800000, guid: 105cb24fba0ab0848a51b96b471a76a6, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -65,7 +65,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: a2383a7bc4d0315429fc78b261c9936e, type: 3}
+        m_Texture: {fileID: 2800000, guid: 105cb24fba0ab0848a51b96b471a76a6, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

ColorlessWorld-2024-4-2/Assets/Materials/Map/WhiteMap.mat

@@ -41,7 +41,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _BaseMap:
-        m_Texture: {fileID: 2800000, guid: f80722e7ccd4b4f4e849115ff107499d, type: 3}
+        m_Texture: {fileID: 2800000, guid: 07d1e190dd150524083eb22239dbab4d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BumpMap:
@@ -65,7 +65,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: f80722e7ccd4b4f4e849115ff107499d, type: 3}
+        m_Texture: {fileID: 2800000, guid: 07d1e190dd150524083eb22239dbab4d, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Boom.prefab

@@ -0,0 +1,208 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1496019408761085200
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5563030652977735299}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5563030652977735299
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1496019408761085200}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.17, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 6047049870113643063}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2458175114420723768
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6047049870113643063}
+  - component: {fileID: 4354208083307919355}
+  - component: {fileID: 1659492356731567997}
+  m_Layer: 0
+  m_Name: Boom
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6047049870113643063
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2458175114420723768}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0.13052616, z: 0, w: 0.9914449}
+  m_LocalPosition: {x: 3.592, y: 1, z: -1.2736247}
+  m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 5563030652977735299}
+  - {fileID: 213849091084324756}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 15, z: 0}
+--- !u!212 &4354208083307919355
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2458175114420723768}
+  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: 2
+  m_Sprite: {fileID: 21300000, guid: f9ca4d2a420a8f14b8ff292551fc0001, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1.923, y: 1.879}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &1659492356731567997
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2458175114420723768}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e23452b3c4954f409d3aecbaa273cb7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  templateEnemyState: {fileID: 11400000, guid: 5630b3d7678ebcc43857b91620b17739, type: 2}
+  EnemyState: {fileID: 0}
+  positionX: 0
+  positionY: 0
+  pasth: []
+  oppositePasth: []
+  moveType: 0
+  rangePool: []
+  aoeRangePool: []
+  stateText: 
+  jumpHeight: 0
+  posCount: 0
+  jumpSpeed: 0
+  speedCurve:
+    serializedVersion: 2
+    m_Curve: []
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  enemyType: 1
+  enemyScript: 0
+  lineAim: {fileID: 0}
+  canLineAppre: 0
+  disableAttack: {fileID: 0}
+  enemyUIBar: {fileID: 0}
+  blockUIBar: {fileID: 0}
+  enemyUI: {fileID: 0}
+  followPoint: {fileID: 5563030652977735299}
+  bone: {fileID: 0}
+  bone_Re: {fileID: 0}
+  lasteHp: 0
+  anim: {fileID: 0}
+  meleeAttackSpeed: 0
+  meleeAttackSpeedCurve:
+    serializedVersion: 2
+    m_Curve: []
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  colorUnderAttack: 0
+  canMove: 0
+  planAction: 0
+  damage: 4
+  damageParticle: {fileID: 0}
+  particlePoint: {fileID: 213849091084324756}
+--- !u!1 &8227655768270691818
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 213849091084324756}
+  m_Layer: 0
+  m_Name: ParticalPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &213849091084324756
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8227655768270691818}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.814, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 6047049870113643063}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Boom.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1daabfecd71e04b4a8a8a2664ac80287
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/TntBurket.prefab

@@ -0,0 +1,173 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1496019408761085200
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5563030652977735299}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5563030652977735299
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1496019408761085200}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.17, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 6047049870113643063}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2458175114420723768
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6047049870113643063}
+  - component: {fileID: 4354208083307919355}
+  - component: {fileID: 7413273311470108406}
+  m_Layer: 0
+  m_Name: TntBurket
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6047049870113643063
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2458175114420723768}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0.13052616, z: 0, w: 0.9914449}
+  m_LocalPosition: {x: 3.592, y: 1, z: -1.2736247}
+  m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 5563030652977735299}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 15, z: 0}
+--- !u!212 &4354208083307919355
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2458175114420723768}
+  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: 2
+  m_Sprite: {fileID: 21300000, guid: f9ca4d2a420a8f14b8ff292551fc0001, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1.923, y: 1.879}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &7413273311470108406
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2458175114420723768}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37b795f1ee3c9514388b0e658e09a7cb, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  templateEnemyState: {fileID: 11400000, guid: 5630b3d7678ebcc43857b91620b17739, type: 2}
+  EnemyState: {fileID: 0}
+  positionX: 0
+  positionY: 0
+  pasth: []
+  oppositePasth: []
+  moveType: 0
+  rangePool: []
+  aoeRangePool: []
+  stateText: 
+  jumpHeight: 0
+  posCount: 0
+  jumpSpeed: 0
+  speedCurve:
+    serializedVersion: 2
+    m_Curve: []
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  enemyType: 1
+  enemyScript: 0
+  lineAim: {fileID: 0}
+  canLineAppre: 0
+  disableAttack: {fileID: 0}
+  enemyUIBar: {fileID: 0}
+  blockUIBar: {fileID: 0}
+  enemyUI: {fileID: 0}
+  followPoint: {fileID: 5563030652977735299}
+  bone: {fileID: 0}
+  bone_Re: {fileID: 0}
+  lasteHp: 0
+  anim: {fileID: 0}
+  meleeAttackSpeed: 0
+  meleeAttackSpeedCurve:
+    serializedVersion: 2
+    m_Curve: []
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  colorUnderAttack: 0
+  canMove: 0
+  planAction: 0

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/TntBurket.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2ff667ec3c0ead1489561be6ee849cf5
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Whirlpool.prefab

@@ -0,0 +1,131 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1496019408761085200
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5563030652977735299}
+  m_Layer: 0
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5563030652977735299
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1496019408761085200}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.17, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 6047049870113643063}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2458175114420723768
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6047049870113643063}
+  - component: {fileID: 4354208083307919355}
+  - component: {fileID: 3998761273940534422}
+  m_Layer: 0
+  m_Name: Whirlpool
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6047049870113643063
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2458175114420723768}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0.13052616, z: 0, w: 0.9914449}
+  m_LocalPosition: {x: 3.592, y: 1, z: -1.2736247}
+  m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 5563030652977735299}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 15, z: 0}
+--- !u!212 &4354208083307919355
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2458175114420723768}
+  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: 2
+  m_Sprite: {fileID: 21300000, guid: f9ca4d2a420a8f14b8ff292551fc0001, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1.923, y: 1.879}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &3998761273940534422
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2458175114420723768}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8e1d4d1a606d36b43ae3dd2b9a98896f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/Whirlpool.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 30978031425a092489836b029a432124
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/PlaceItem/Tree/tree.prefab

@@ -25,9 +25,9 @@ Transform:
   m_GameObject: {fileID: 1496019408761085200}
   serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: -0.945, z: 0}
-  m_LocalScale: {x: 1.1111112, y: 1.1111112, z: 1.1111112}
-  m_ConstrainProportionsScale: 0
+  m_LocalPosition: {x: 0, y: 1.17, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
   m_Children: []
   m_Father: {fileID: 6047049870113643063}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -41,7 +41,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6047049870113643063}
   - component: {fileID: 4354208083307919355}
-  - component: {fileID: 8645409521225535772}
+  - component: {fileID: 4840821816182305307}
   m_Layer: 0
   m_Name: tree
   m_TagString: Untagged
@@ -57,14 +57,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2458175114420723768}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0, y: 0.13052616, z: 0, w: 0.9914449}
   m_LocalPosition: {x: 3.592, y: 1, z: -1.2736247}
   m_LocalScale: {x: 0.9, y: 0.9, z: 0.9}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 5563030652977735299}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 15, z: 0}
 --- !u!212 &4354208083307919355
 SpriteRenderer:
   m_ObjectHideFlags: 0
@@ -117,7 +117,7 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
---- !u!114 &8645409521225535772
+--- !u!114 &4840821816182305307
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -126,7 +126,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2458175114420723768}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b93e606dce1c400408bd059eaaa399b2, type: 3}
+  m_Script: {fileID: 11500000, guid: 7ab239a945e04874b9c7b6623dafa738, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   templateEnemyState: {fileID: 11400000, guid: b991b3f0500bd0c439d1a956c497c4cb, type: 2}
@@ -153,8 +153,9 @@ MonoBehaviour:
   lineAim: {fileID: 0}
   canLineAppre: 0
   disableAttack: {fileID: 0}
-  enemyUIBar: {fileID: 8570734685845233804, guid: 825ad890badfb4c4c9829a5507a78704,
-    type: 3}
+  enemyUIBar: {fileID: 0}
+  blockUIBar: {fileID: 0}
+  enemyUI: {fileID: 0}
   followPoint: {fileID: 5563030652977735299}
   bone: {fileID: 0}
   bone_Re: {fileID: 0}
@@ -169,3 +170,4 @@ MonoBehaviour:
     m_RotationOrder: 4
   canMove: 0
   planAction: 0
+  drawCardCount: 2

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/BlockUI.prefab

@@ -0,0 +1,221 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &2178019249198261378
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5123979534011710944}
+  - component: {fileID: 2903911825228524820}
+  - component: {fileID: 5095775672033324402}
+  - component: {fileID: 7799753889356525448}
+  - component: {fileID: 834401379151730417}
+  m_Layer: 0
+  m_Name: BlockUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &5123979534011710944
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2178019249198261378}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.1111112, y: 1.1111112, z: 1.1111112}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6855744349790467626}
+  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_AnchoredPosition: {x: 0, y: 1.0300293}
+  m_SizeDelta: {x: 1, y: 1}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!223 &2903911825228524820
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2178019249198261378}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 2
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  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: 801241541
+  m_SortingOrder: 3
+  m_TargetDisplay: 0
+--- !u!114 &5095775672033324402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2178019249198261378}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 1
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!114 &7799753889356525448
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2178019249198261378}
+  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 &834401379151730417
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2178019249198261378}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 9589dd4a7dfeb964e922c99edfe45552, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  hpFather: {fileID: 6855744349790467626}
+  hpBarPrefab: {fileID: 5397458449839102954, guid: 444e329bbacecf844a2e5c495782b76f,
+    type: 3}
+  hpBarList: []
+--- !u!1 &2195838793956914495
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6855744349790467626}
+  - component: {fileID: 7454921136897808794}
+  - component: {fileID: 5618704182416084380}
+  - component: {fileID: 308611492627838238}
+  m_Layer: 0
+  m_Name: HPbarPanle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6855744349790467626
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2195838793956914495}
+  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: 5123979534011710944}
+  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 &7454921136897808794
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2195838793956914495}
+  m_CullTransparentMesh: 1
+--- !u!114 &5618704182416084380
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2195838793956914495}
+  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!114 &308611492627838238
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2195838793956914495}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 0.1, y: 0.35}
+  m_Spacing: {x: 0.1, y: 0.05}
+  m_Constraint: 0
+  m_ConstraintCount: 2

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/BlockUI.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e2bd5f6b1ddfe7748b6a411de1af62ff
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/BlokUIBar.prefab

@@ -0,0 +1,77 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5397458449839102954
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 805919146886288724}
+  - component: {fileID: 3127720291614942676}
+  - component: {fileID: 3919888235731662184}
+  m_Layer: 0
+  m_Name: BlokUIBar
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &805919146886288724
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5397458449839102954}
+  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: 0}
+  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.5, y: 0.5}
+--- !u!222 &3127720291614942676
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5397458449839102954}
+  m_CullTransparentMesh: 1
+--- !u!114 &3919888235731662184
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5397458449839102954}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.0032484946, g: 0.57160896, b: 0.6886792, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/BlokUIBar.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 444e329bbacecf844a2e5c495782b76f
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab

@@ -784,6 +784,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   image: {fileID: 8051707880280472587}
+  text: {fileID: 0}
+  uItype: 0
   white: {r: 1, g: 1, b: 1, a: 1}
   black: {r: 0.5294118, g: 0.5294118, b: 0.5294118, a: 1}
   originColor: {r: 1, g: 1, b: 1, a: 1}
@@ -866,7 +868,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 994
+  m_Text: 987
 --- !u!1 &4939717426418636302
 GameObject:
   m_ObjectHideFlags: 0
@@ -1017,7 +1019,7 @@ MonoBehaviour:
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 0
-  m_FillAmount: 1
+  m_FillAmount: 0.991
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
@@ -1035,6 +1037,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   image: {fileID: 3535951898584899345}
+  text: {fileID: 0}
+  uItype: 0
   white: {r: 0.6037736, g: 0.6037736, b: 0.6037736, a: 0.78431374}
   black: {r: 0, g: 0, b: 0, a: 0.78431374}
   originColor: {r: 0, g: 0, b: 0, a: 0}
@@ -1375,7 +1379,7 @@ MonoBehaviour:
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillMethod: 0
-  m_FillAmount: 0.994
+  m_FillAmount: 0.987
   m_FillClockwise: 1
   m_FillOrigin: 0
   m_UseSpriteMesh: 0

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

@@ -195,6 +195,7 @@ public class CardEntity : MonoBehaviour
         CardOnMouseEnter cardOnMouseEnter = GetComponent<CardOnMouseEnter>();
         //关闭协程
         cardOnMouseEnter.StopAllCoroutines();
+      
         GetComponent<CardDrag>().enabled = false;
         cardOnMouseEnter.enabled = false;
 

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

@@ -390,8 +390,14 @@ public class TurnMaster : Singleton<TurnMaster>
 
         CardActiveSort.Instance.drawCardCount = actualCardsToDraw;
         CardActiveSort.Instance.StartCoroutine(CardActiveSort.Instance.ReflashCardPointWithDrawCards());
-
+        Debug.Log("抽卡点1");
+        while (CardActiveSort.Instance.canDrawCard ==false )
+        {
+            Debug.Log("抽卡点"+CardActiveSort.Instance.canDrawCard);
+            yield return null;
+        }
         yield return new WaitUntil(() => CardActiveSort.Instance.canDrawCard == true);
+        Debug.Log("抽卡点2");
         for (int i = handCardCount; i < handCardCount + actualCardsToDraw; i++)
         {  
 

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs

@@ -35,7 +35,7 @@ public class EnemyManager : Singleton<EnemyManager>
 
     [Header("¹ÖÎï¾ÖÄÚUIÌõ")]
     public GameObject enemyUIBar;
-
+    public GameObject blockUIBar;
     public enum EnemyTurnState
     {
         stop,

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs

@@ -3,6 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
+using UnityEditor.MemoryProfiler;
 using UnityEngine;
 using UnityEngine.Assertions;
 using UnityEngine.UI;
@@ -50,7 +51,8 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
 
     [Header("敌人UI控制器")]
     public EnemyUIBar enemyUIBar;
-    GameObject enemyUI;//UI¸úËæ
+    public BlockUIBar blockUIBar;
+    public GameObject enemyUI;//UI跟随
     public Transform followPoint;//跟随点
 
     [Header("当前意图脚本")]
@@ -66,6 +68,9 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
     [Header("敌人近战攻击动画速度")]
     public float meleeAttackSpeed;
     public AnimationCurve meleeAttackSpeedCurve;
+    [Header("敌人受到哪种颜色攻击")]
+    public int colorUnderAttack;
+
     public enum EnemyType
     {
         enemy,
@@ -129,6 +134,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         {
             CreatEnemyUIBar(this);
         }
+        
     }
     private void OnDisable()
     {
@@ -152,7 +158,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
 
     private void Update()
     {
-        if(disableAttack != null)
+        if(disableAttack != null&& enemyType == EnemyType.enemy)
         {
             if (rangePool.Contains(GameManager.Instance.playerOn))
             {
@@ -186,10 +192,11 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
             if(enemyType == EnemyType.block )
             {
                 EnemyState.currentNumberOfHits -= 1;
+                blockUIBar.SyncHp(EnemyState.currentNumberOfHits);
                 if(EnemyState.currentNumberOfHits <= 0 )
                 {
                     GameManager.Instance.X[positionX].Y[positionY].blocked = false;
-                    Destroy(this .gameObject );
+                    OnDeath();
                 }
             }
         }
@@ -199,25 +206,27 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
     //展示虚血（预计伤害）
     public void ShowExpHp(HashSet <MapUnity > mapUnities )
     {
-        if (EnemyState.shieldValue > 0&& Usermanager.Instance.expectDamage>0)
+        if(enemyType == EnemyType.enemy )
+        {
+            if (EnemyState.shieldValue > 0 && Usermanager.Instance.expectDamage > 0)
             {
                 enemyUIBar.sheildFlash.enabled = true;
             }
             if (mapUnities.Contains(GameManager.Instance.X[positionX].Y[positionY]))
             {
                 enemyUIBar.isSync = false;
-            float remainDamage = EnemyState .shieldValue - Usermanager.Instance.expectDamage;
-            if(remainDamage >=0)
+                float remainDamage = EnemyState.shieldValue - Usermanager.Instance.expectDamage;
+                if (remainDamage >= 0)
                 {
-                enemyUIBar.sheildText .text = remainDamage.ToString();
+                    enemyUIBar.sheildText.text = remainDamage.ToString();
                 }
                 else
                 {
                     enemyUIBar.sheildText.text = "0";
                     enemyUIBar.expHPBar.gameObject.SetActive(true);
-                enemyUIBar.currentHPText.text = (EnemyState.currentHP+remainDamage).ToString();
+                    enemyUIBar.currentHPText.text = (EnemyState.currentHP + remainDamage).ToString();
                     enemyUIBar.expHPBar.fillAmount = EnemyState.currentHP / EnemyState.maxHP;
-                enemyUIBar.expAfterHPBar.fillAmount= (EnemyState.currentHP + remainDamage) / EnemyState.maxHP;
+                    enemyUIBar.expAfterHPBar.fillAmount = (EnemyState.currentHP + remainDamage) / EnemyState.maxHP;
                 }
 
             }
@@ -226,20 +235,26 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
                 HideExpHP();
             }
         }
+      
+    }
     //关闭虚血展示
     public void HideExpHP()
     {
-        enemyUIBar.expHPBar.gameObject .SetActive (false );
+        if (enemyType == EnemyType.enemy)
+        {
+            enemyUIBar.expHPBar.gameObject.SetActive(false);
             enemyUIBar.isSync = true;
             enemyUIBar.sheildFlash.enabled = false;
             enemyUIBar.sheildFlash.image.color = enemyUIBar.sheildFlash.originColor;
         }
+           
+    }
     IEnumerator EnemyHurtVoice(float time)
     {
         yield return new WaitForSeconds(time);
         AudioManager.Instance.EnemyHurtVoicePlayer();     
     }
-    public void CreatEnemyUIBar(EnemyNode enemyNode )
+    public virtual void CreatEnemyUIBar(EnemyNode enemyNode )
     {
         enemyUI = Instantiate(EnemyManager.Instance.enemyUIBar,enemyNode. followPoint.position,followPoint.rotation);
         enemyUI.transform.SetParent(enemyNode . transform);
@@ -743,7 +758,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
 
     }
     //死亡时
-    public void OnDeath()
+    public virtual void OnDeath()
     {
         if (EnemyState.abnormalCondition.TryGetValue(AbnormalCondition.posion,out Buff posionbuff)&&
             LegacyManager.Instance.relicClassNameList.Contains(Name.Legacy.LegacyNode_SnakeGall))

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BlockNode.cs

@@ -0,0 +1,44 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BlockNode : EnemyNode 
+{
+    public  void OnEnable()
+    {
+        EnemyManager.Instance.enemyObservers.Add(this);
+
+        if (templateEnemyState != null)
+            EnemyState = Instantiate(templateEnemyState);
+
+           blockUIBar = GetComponent<BlockUIBar>();
+    }
+
+    private void OnDisable()
+    {
+        if (EnemyManager.Instance != null)
+        {
+            EnemyManager.Instance.enemyObservers.Remove(this);
+        }
+    }
+    private void Start()
+    {
+        if (blockUIBar == null)
+        {
+            CreatEnemyUIBar(this);
+        }
+        lasteHp = (int)EnemyState.currentHP;
+    }
+    public override void CreatEnemyUIBar(EnemyNode enemyNode)
+    {
+        enemyUI = Instantiate(EnemyManager.Instance.blockUIBar , enemyNode.followPoint.position, followPoint.rotation);
+        enemyUI.transform.SetParent(enemyNode.transform);
+        blockUIBar = enemyUI.GetComponent<BlockUIBar>();
+        blockUIBar.CreatSartHp(EnemyState.currentNumberOfHits);
+       // blockUIBar.enemyNode = enemyNode;
+    }
+    public override void OnDeath()
+    {
+        Destroy(this.gameObject);
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoomNode.cs

@@ -0,0 +1,80 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
+using Unity.VisualScripting;
+using UnityEditor.Experimental.GraphView;
+using UnityEngine;
+using UnityEngine.InputSystem;
+using UnityEngine.UIElements;
+
+public class BoomNode : BlockNode
+{
+    public int damage = 4;
+    public GameObject damageParticle;
+    public Transform particlePoint;
+    public override void OnDeath()
+    {
+        StartCoroutine(DrawCardAndDestory());
+    }
+
+    IEnumerator DrawCardAndDestory()
+    {
+        //¼ÆËã½Ç¶È
+        MapUnity currentNode = GameManager.Instance.X[positionX].Y[positionY];
+        CAngle(currentNode);
+        currentNode.blocked  = false;
+        currentNode.enemyNode  = null;
+        Destroy(this.gameObject);
+        yield break;
+    }
+
+    public void CAngle(MapUnity currentNode)
+    {
+        List<MapUnity> effectRangePreviewPool = new List<MapUnity>();
+
+        Vector3 direction = transform.position- GameManager.Instance.player.transform.position ;
+        float angle1 = Vector3.SignedAngle(transform.forward, direction, transform.up);
+
+        if (angle1 < 0)
+        {
+            angle1 += 360f;
+        }
+        if (angle1 >= 300f)
+        { 
+            angle1 = 330f;
+        }
+        else if (angle1 >= 240f)
+        {
+            angle1 = 270f;
+        }
+        else if (angle1 >= 180f)
+        {
+            angle1 = 210f;
+        }
+        else if (angle1 >= 120f)
+        {
+            angle1 = 150f;
+        }
+        else if (angle1 >= 60f)
+        {
+            angle1 = 90f;
+        }
+        else if (angle1 >= 0f)
+        {
+            angle1 = 30f;
+        }
+
+        effectRangePreviewPool = getNodeTools.setEffectRangePreviewNoCard("4_1", angle1, currentNode).ToList ();
+
+       // SettlementManager.Instance.damageWork(damage, effectRangePreviewPool, -1);
+
+        foreach (var mapNode in effectRangePreviewPool )
+        {
+            // Vector3 pos = mapNode.transform.position;
+            //  pos.y = particlePoint.position.y;
+            //  var bluePartical = Instantiate(ParticalManager.Instance.redParticleEffect,pos, ParticalManager.Instance.redParticleEffect.transform.rotation);
+            // bluePartical.transform.SetParent(currentNode.transform);
+            mapNode.switchColor(colorUnderAttack);
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoomNode.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/BlockNode.cs → ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoxNode.cs

@@ -2,11 +2,11 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class BlockNode : MonoBehaviour
+public class BoxNode : MonoBehaviour
 {
     EnemyNode enemyNode;
 
-    [Header ("±¦Ï佱Ʒ")]
+    [Header("±¦Ï佱Ʒ")]
     public List<GameObject> rewardList = new List<GameObject>();
 
     public enum BlockType
@@ -37,7 +37,7 @@ public class BlockNode : MonoBehaviour
                 break;
             case BlockType.box:
                 //Éú³É½±Àø
-                if(rewardList .Count >0)
+                if (rewardList.Count > 0)
                 {
                     Instantiate(rewardList[Random.Range(0, rewardList.Count)], this.transform.position, Quaternion.identity);
                 }

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/BoxNode.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TNTBucketNode.cs

@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TNTBucketNode : BlockNode
+{
+    public override void OnDeath()
+    {
+        StartCoroutine(DrawCardAndDestory());
+    }
+
+    IEnumerator DrawCardAndDestory()
+    {
+        foreach  (var node in GameManager.Instance.X[positionX].Y[positionY].unitPool )
+        {
+            if(node != null )
+            {
+                node.switchColor(colorUnderAttack);
+            }   
+        }
+        GameManager.Instance.X[positionX].Y[positionY].blocked = false;
+        GameManager.Instance.X[positionX].Y[positionY].enemyNode = null;
+        Destroy(this.gameObject);
+        yield break;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TNTBucketNode.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs

@@ -0,0 +1,27 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TreeNode : BlockNode
+{
+    public int drawCardCount=2;
+    public override void OnDeath()
+    {
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.banDrawCard))
+        {
+        }
+        else
+        {
+            StartCoroutine(DrawCardAndDestory());
+        }
+    }
+
+    IEnumerator DrawCardAndDestory()
+    {
+        TurnMaster.Instance.StartCoroutine(TurnMaster.Instance.drawCards(drawCardCount));
+        yield return StartCoroutine(TurnMaster.Instance.MoveCards());
+        GameManager.Instance.X[positionX].Y[positionY].blocked = false;
+        GameManager.Instance.X[positionX].Y[positionY].enemyNode = null;
+        yield break;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockNode/TreeNode.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockUI.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockUI/BlockUIBar.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class BlockUIBar : MonoBehaviour
+{
+    public Transform hpFather;
+    public GameObject hpBarPrefab;
+    public List<GameObject> hpBarList;
+   public void SyncHp(int hitTimes)
+   {
+        int cha=0;
+        if(hpBarList .Count != hitTimes )
+        {
+            cha = hitTimes - hpBarList.Count;
+        }
+       
+        for (int i = 0; i < MathF.Abs(cha); i++)
+        {
+            if(cha <0)
+            {
+                Destroy(hpBarList[0]);
+                hpBarList.RemoveAt(0);
+            }
+            else
+            {
+                var bar = Instantiate(hpBarPrefab, hpFather);
+                hpBarList .Add(bar);
+            }
+        }
+
+   }
+    public void CreatSartHp(int hitTimes)
+    {
+        for (int i = 0; i < hitTimes; i++)
+        {
+            var bar = Instantiate(hpBarPrefab, hpFather);
+            hpBarList.Add(bar);
+        }
+
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Block/BlockUI/BlockUIBar.cs.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyUI/Enemy.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item.meta

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

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/Whirlpool.cs

@@ -0,0 +1,46 @@
+using System.Collections;
+using System.Collections.Generic;
+using Unity.PlasticSCM.Editor.WebApi;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Whirlpool : MonoBehaviour
+{
+    public int posX, posY;
+    public int holdColorCount=7;
+    public Text holdeText;
+    public List<MapUnity> holdPool;
+
+    private void Start()
+    {
+        MapUnity  currentNode = GameManager .Instance .X[posX].Y[posY];
+        this.gameObject.transform.position = currentNode.transform.position;
+        for(int i=0;i<currentNode .unitPool .Count;i++)
+        {
+            if(currentNode.unitPool[i]!= null )
+            {
+                currentNode.unitPool[i].switchColor(2);
+                holdPool .Add(currentNode.unitPool[i]);
+            }
+        }
+        holdPool.Add(currentNode);
+        holdeText .text =holdColorCount .ToString();
+        GameManager.Instance.playerUsedCard += WhirlpoolHold;
+    }
+    public void WhirlpoolHold()
+    {
+        for (int i = 0; i < holdPool.Count ; i++)
+        {
+            if (holdPool[i] != null && holdPool[i].whoColour !=2)
+            {
+                holdPool[i].switchColor(2);
+                holdColorCount -= 1;
+                holdeText.text = holdColorCount.ToString();
+                if (holdColorCount <=0)
+                {
+                    Destroy(this.gameObject);
+                }
+            }
+        }
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Item/Whirlpool.cs.meta

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

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

@@ -59,12 +59,14 @@ public class GameManager : Singleton<GameManager>
     public Image Bule;
     public Image Black; 
     public Image White;
+    public Image Metal;
     [Header("场地颜色分度盘文字")]
     public Text redText;
     public Text greenText;
     public Text blueText;
     public Text blackText;
     public Text whiteText;
+    public Text metalText;
     public Text sumPlayerText;
     public Text sumMiddleText;
     public Text sumRightText;
@@ -84,6 +86,7 @@ public class GameManager : Singleton<GameManager>
     float blueNodeCountLatest;
     float greenNodeCountLatest;
     float whiteNodeCountLatest;
+    float metalNodeCountLatest;
     float blackNodeCountLatest;
     [Header("场地颜色分度盘文字预览")]
     public Text redTextPre;
@@ -91,6 +94,7 @@ public class GameManager : Singleton<GameManager>
     public Text blueTextPre;
     public Text blackTextPre;
     public Text whiteTextPre;
+    public Text metalTextPre;
     public Text sumPlayerTextPre;
     public Text sumMiddleTextPre;
     public Text sumRightTextPre;
@@ -111,6 +115,8 @@ public class GameManager : Singleton<GameManager>
     public CardEntity currentCardEntity;
     [Header("当前玩家拖拽的卡牌选中的地块")]
     public MapUnity currentMapNode;
+
+   
     private void Start()
     {
         //生成空地图列表
@@ -221,12 +227,14 @@ public class GameManager : Singleton<GameManager>
         float greenNodeCount = MapUnityManager.Instance.greenNodeCount;
         float whiteNodeCount = MapUnityManager.Instance.whiteNodeCount;
         float blackNodeCount = MapUnityManager.Instance.blackNodeCount;
+        float metalNodeCount = MapUnityManager.Instance.metalNodeCount;
 
         redNodeCountLatest = Mathf.Lerp(redNodeCountLatest, redNodeCount, Time.deltaTime * sunSpeed);
         blueNodeCountLatest = Mathf.Lerp(blueNodeCountLatest, blueNodeCount, Time.deltaTime * sunSpeed);
         greenNodeCountLatest = Mathf.Lerp(greenNodeCountLatest, greenNodeCount, Time.deltaTime * sunSpeed);
         // float currentWhiteNodeCount = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed);
         whiteNodeCountLatest = Mathf.Lerp(whiteNodeCountLatest, whiteNodeCount, Time.deltaTime * sunSpeed);
+        metalNodeCountLatest = Mathf.Lerp(metalNodeCountLatest, metalNodeCount, Time.deltaTime * sunSpeed);
         //blackNodeCountLatest = Mathf.Lerp(blackNodeCountLatest, blackNodeCount, Time.deltaTime * sunSpeed);
         //文字
         redText.text = redNodeCount.ToString();
@@ -244,8 +252,11 @@ public class GameManager : Singleton<GameManager>
         whiteText.text = whiteNodeCount.ToString();
         if (whiteNodeCount == 0)
             whiteText.text = " ";
+        metalText.text = metalNodeCount.ToString();
+        if (metalNodeCount == 0)
+            metalText.text = " ";
         sumPlayerText.text = (redNodeCount + blueNodeCount + greenNodeCount).ToString();
-        sumMiddleText.text = whiteNodeCount.ToString();
+        sumMiddleText.text = (whiteNodeCount+metalNodeCount ).ToString();
         sumRightText.text = blackNodeCount.ToString();
         float totoalNode = redNodeCount + blueNodeCount + greenNodeCount + whiteNodeCount + blackNodeCount;
         //文字位置
@@ -253,17 +264,19 @@ public class GameManager : Singleton<GameManager>
         redText.transform.localPosition = new Vector3((length * (Red.fillAmount - 1)) * 0.5f, 0, 0);
         greenText.transform.localPosition = new Vector3(length * 0.5f * (Green.fillAmount + Red.fillAmount - 1), 0, 0);
         blueText.transform.localPosition = new Vector3(length * 0.5f * (Bule.fillAmount + Green.fillAmount - 1), 0, 0);
-        whiteText.transform.localPosition = new Vector3(length * 0.5f * (White.fillAmount + Bule.fillAmount - 1), 0, 0);
+        metalText.transform.localPosition = new Vector3(length * 0.5f * (Metal.fillAmount + Bule.fillAmount - 1), 0, 0);
+        whiteText.transform.localPosition = new Vector3(length * 0.5f * (White.fillAmount + Metal.fillAmount - 1), 0, 0);
         blackText.transform.localPosition = new Vector3(length * 0.5f * White.fillAmount, 0, 0);
 
         sumPlayerText.transform.localPosition = new Vector3(length * (Bule.fillAmount - 1) * 0.5f, 150, 0);
-        sumMiddleText.transform.localPosition = new Vector3(whiteText.transform.localPosition.x, 150, 0);
+        sumMiddleText.transform.localPosition = new Vector3((whiteText.transform.localPosition.x+ metalText.transform.localPosition.x)*0.5f, 150, 0);
         sumRightText.transform.localPosition = new Vector3(blackText.transform.localPosition.x, 150, 0);
         //颜色
         Red.fillAmount = redNodeCountLatest / totoalNode;
         Green.fillAmount = Red.fillAmount + greenNodeCountLatest / totoalNode;
         Bule.fillAmount = Green.fillAmount + blueNodeCountLatest / totoalNode;
-        White.fillAmount = Bule.fillAmount + whiteNodeCountLatest / totoalNode;
+        Metal.fillAmount= Bule.fillAmount+ metalNodeCountLatest / totoalNode;
+        White.fillAmount = Metal.fillAmount + whiteNodeCountLatest / totoalNode;
         // Black.fillAmount = Bule.fillAmount + blackNodeCountLatest / totoalNode;
         //预览涂色
         if (onDrag && currentCardEntity != null )
@@ -360,6 +373,19 @@ public class GameManager : Singleton<GameManager>
                         }
                         blackTextPre.transform.localPosition = new Vector3(blackText.transform.localPosition.x, blackText.transform.localPosition.y - 50f,  0);
                         break;
+                    case 6:
+                        metalText.text = (metalNodeCount + ints[i]).ToString();
+                        metalTextPre.gameObject.SetActive(true);
+                        if (ints[i] > 0)
+                        {
+                           metalTextPre.text = "(" + "+" + ints[i].ToString() + ")";
+                        }
+                        else
+                        {
+                            metalTextPre.text = "(" + ints[i].ToString() + ")";
+                        }
+                        metalTextPre.transform.localPosition = new Vector3(metalText.transform.localPosition.x,metalText.transform.localPosition.y - 50f, 0);
+                        break;
                 } 
             }
            
@@ -374,16 +400,16 @@ public class GameManager : Singleton<GameManager>
             {
                 sumPlayerTextPre.text = "(" + (ints[1] + ints[3] + ints[4]).ToString() + ")";
             } 
-            sumMiddleText.text = (whiteNodeCount + ints[2]).ToString();
+            sumMiddleText.text = (whiteNodeCount+metalNodeCount + ints[2] + ints[6]).ToString();
             sumMiddleTextPre .gameObject .SetActive(true);
             sumMiddleTextPre.transform.localPosition = new Vector3(sumMiddleText.transform.localPosition.x + 150f, sumMiddleText.transform.localPosition.y, 0);
-            if (ints[2] > 0)
+            if (ints[2]+ ints[6] > 0)
             {
-                sumMiddleTextPre.text = "(" + "+" +  ints[2].ToString() + ")";
+                sumMiddleTextPre.text = "(" + "+" + (ints[2] + ints[6]).ToString() + ")";
             }
             else
             {
-                sumMiddleTextPre.text = "(" + ints[2].ToString() + ")";
+                sumMiddleTextPre.text = "(" + (ints[2] + ints[6]).ToString() + ")";
             }
             sumRightText.text = (blackNodeCount + ints[5]).ToString();
             sumRightTextPre .gameObject .SetActive(true);
@@ -404,6 +430,7 @@ public class GameManager : Singleton<GameManager>
             blueTextPre.gameObject.SetActive(false);
             greenTextPre.gameObject.SetActive(false);
             blackTextPre.gameObject.SetActive(false);
+            metalTextPre.gameObject.SetActive(false);
             sumPlayerTextPre.gameObject .SetActive(false);
             sumMiddleTextPre.gameObject.SetActive(false);
             sumRightTextPre.gameObject.SetActive(false);
@@ -566,5 +593,13 @@ public class GameManager : Singleton<GameManager>
         yield return null;
     }
 
+
+    //Íæ¼ÒÊÍ·ÅÍêÒ»ÕÅ¿¨ÅÆ
+    public event Action playerUsedCard;
+    public void BroadCastPlayerUsedCard()
+    {
+        if (playerUsedCard != null)
+            playerUsedCard();
+    }
 }
 

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

@@ -162,29 +162,51 @@ public class MapUnity : MonoBehaviour
     }
 
     public void switchColor(int newColor)
+    {
+        if (whoColour!=6)
         {
             whoColour = newColor;
             RefreshWhoColor();
         }
+    }
     public void switchPreColor(int newColor)
     {
-        Debug.Log("ÊÍ·ÅÑÕÉ«"+newColor);
         switch (newColor ) 
         {
             case 1:
                 playerMark.meshRenderer.material = redPre;
+                if(enemyNode !=null )
+                {
+                    enemyNode.colorUnderAttack = 1;
+                }
                 break;
             case 2:
                 playerMark.meshRenderer.material = whitePre;
+                if (enemyNode != null)
+                {
+                    enemyNode.colorUnderAttack = 2;
+                }
                 break;
             case 3:
                 playerMark.meshRenderer.material = bluePre;
+                if (enemyNode != null)
+                {
+                    enemyNode.colorUnderAttack = 3;
+                }
                 break;
             case 4:
                 playerMark.meshRenderer.material = greenPre;
+                if (enemyNode != null)
+                {
+                    enemyNode.colorUnderAttack = 4;
+                }
                 break;
             case 5:
                 playerMark.meshRenderer.material = blackPre;
+                if (enemyNode != null)
+                {
+                    enemyNode.colorUnderAttack = 5;
+                }
                 break;
         }
     }

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

@@ -94,6 +94,7 @@ public static class Name
         public const int Blue = 3;
         public const int White = 2;
         public const int Black = 5;
+        public const int Metal = 6;
         public static readonly List<int> PlayerColor = new() { Red, Green, Blue };
     }
 
@@ -112,6 +113,8 @@ public static class Name
                 intcolor = NodeColor.White; break;
             case Color.Black:
                 intcolor = NodeColor.Black; break;
+            case Color.Metal:
+                intcolor = NodeColor.Metal; break;
         }
         return intcolor;
     }
@@ -123,6 +126,7 @@ public static class Name
         public const string Blue = "blue";
         public const string White = "white";
         public const string Black = "black";
+        public const string Metal = "metal";
     }
 
     public static class CardFunctionString

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

@@ -204,6 +204,8 @@ public class getNodeTools
                 colorCount = MapUnityManager.Instance.blueNodeCount; break;
             case Name.Color.Black:
                 colorCount = MapUnityManager.Instance.blackNodeCount; break;
+            case Name.Color.Metal:
+                colorCount = MapUnityManager.Instance.metalNodeCount; break;
         }
         return colorCount;
     }

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

@@ -136,9 +136,10 @@ public class CardActiveSort : Singleton <CardActiveSort>
             StartCoroutine(MoveCard(cardEntitieList, i));
             yield return new WaitForSeconds(0.1f);
         }
-
+        Debug.Log("抽卡点3");
         canDrawCard = true;//标识已经移动完成，让抽卡方法生成新卡牌
         yield return new WaitUntil(() => prepareHandCard.Count == drawCardCount);//等待新抽的卡牌移动到位
+        Debug.Log("抽卡点4"+drawCardCount );
         //将新加进来的卡牌加入列表
         for (int i = 0; i < prepareHandCard.Count; i++)
         {

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

@@ -15,6 +15,8 @@ public class MapUnityManager : Singleton<MapUnityManager>
 
     public int blackNodeCount;
 
+    public int metalNodeCount;
+
     public string getAdvNode()
     {
         Dictionary<string,int> kvps = new Dictionary<string, int> 
@@ -24,6 +26,7 @@ public class MapUnityManager : Singleton<MapUnityManager>
             { Name.Color.Green, greenNodeCount },
             { Name.Color.Black, blackNodeCount },
             { Name.Color.White, whiteNodeCount },
+            { Name.Color.Metal, metalNodeCount },
         };
         string advColor= GetKeyWithMaxValue(kvps);
         //Debug.Log(advColor);
@@ -66,7 +69,7 @@ public class MapUnityManager : Singleton<MapUnityManager>
     {
         if(GameManager .Instance .complete ==true )
         {
-            int red = 0, blue = 0, green = 0, white = 0, black = 0;
+            int red = 0, blue = 0, green = 0, white = 0, black = 0,metal=0;
             for (int i = 0; i < GameManager.Instance.X.Count; i++)
             {
                 for (int j = 0; j < GameManager.Instance.X[i].Y.Count; j++)
@@ -88,10 +91,13 @@ public class MapUnityManager : Singleton<MapUnityManager>
                         case Name.NodeColor.Green:
                             green++;
                             break;
+                        case Name.NodeColor.Metal:
+                            metal++;
+                            break;
                     }
                 }
             }
-            redNodeCount = red; blueNodeCount = blue; greenNodeCount = green; whiteNodeCount = white; blackNodeCount = black;
+            redNodeCount = red; blueNodeCount = blue; greenNodeCount = green; whiteNodeCount = white; blackNodeCount = black;metalNodeCount =metal;
         }
        
     }

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

@@ -78,7 +78,7 @@ public class SettlementManager : Singleton<SettlementManager>
     //Ô¤¼ÆµØ¿é¼ÆÊý
     public  List <int>  PreviewColorMapUnity(CardOriginalData cardOriginalData, MapUnity targetNode)
     {
-        List<int > mapColorCount = new List<int>() { 0,0,0,0,0,0};//1red,2white,3blue,4green,5black
+        List<int > mapColorCount = new List<int>() { 0,0,0,0,0,0,0};//1red,2white,3blue,4green,5black,6matel
 
         ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
         int offset = 3;
@@ -91,7 +91,7 @@ public class SettlementManager : Singleton<SettlementManager>
         if (!cardOriginalData.nodesColor[0].Equals(Name.none))
         {
             // targetNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[0]));
-            if (targetNode.whoColour != Name.stringColorToint(cardOriginalData.nodesColor[0]))
+            if (targetNode.whoColour != Name.stringColorToint(cardOriginalData.nodesColor[0])&&targetNode .whoColour !=6)
             {
                 mapColorCount[Name.stringColorToint(cardOriginalData.nodesColor[0])] += 1;
                 mapColorCount[targetNode.whoColour] -= 1;
@@ -112,7 +112,7 @@ public class SettlementManager : Singleton<SettlementManager>
                 if (endNode != null)
                 {
                     // endNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[i + 1]));
-                    if(endNode.whoColour != Name.stringColorToint(cardOriginalData.nodesColor[i + 1]))
+                    if(endNode.whoColour != Name.stringColorToint(cardOriginalData.nodesColor[i + 1]) && endNode.whoColour != 6)
                     {
                         mapColorCount[Name.stringColorToint(cardOriginalData.nodesColor[i + 1])] += 1;
                         mapColorCount[endNode.whoColour] -= 1;
@@ -485,7 +485,7 @@ public class SettlementManager : Singleton<SettlementManager>
             GameManager.Instance.playerState.currentStepRange = trueStep;
         }
     }
-    private void damageWork(int damageVal, List<MapUnity> influencePreviewPool,int pierceNum)
+    public void damageWork(int damageVal, List<MapUnity> influencePreviewPool,int pierceNum)
     {
         int pierceCount=0;
         if (pierceNum!=-1)
@@ -681,6 +681,8 @@ public class SettlementManager : Singleton<SettlementManager>
         Usermanager.Instance.RefreshPlayerBuffIcon();
         GameManager.Instance.SyncColourCountUI();
         EnemyManager.Instance.enemyRefreshEnemyBuffIcon(0);
+        //广播释放完一张卡牌的接口
+        GameManager.Instance.BroadCastPlayerUsedCard();
     }
 
     //Ô¤ÆÚÉ˺¦