ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset

@@ -13,16 +13,10 @@ MonoBehaviour:
   m_Name: cardDeckList
   m_EditorClassIdentifier: 
   cardDeckList:
-  - 2038
-  - 2038
-  - 2030
-  - 2023
   - 1005
-  - 1016
   - 1005
   - 1005
-  - 1016
-  - 2030
-  - 1016
   - 1005
-  - 2008
+  - 1005
+  - 2001
+  - 1012

ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/09_虚弱.png.meta

@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: d847c7e75ba17424c9cbca7622ee35b7
-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/11_传染.png.meta

@@ -1,127 +0,0 @@
-fileFormatVersion: 2
-guid: 5b205a17a02d3b74a910b1b7717d9e00
-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/02_易伤.png.meta → ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/c_bule.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a87d79df0fc0ade49a0d5dda2dacf849
+guid: c41f01bfd482f114eafa20dfde642e77
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 13b76a9811c506746952a43e5dec9fb5
+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/c_red.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: f9169620214f58142a1eef7da07ec270
+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/c_white.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 81974f89d5dfab041a1cca8dc1504446
+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/c_yellow.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 4b35e995826f13a4eb6eb9732a4dd902
+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/para.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 876811427f51a814aaf7a5e454b4efce
+guid: 5b205a17a02d3b74a910b1b7717d9e00
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: bc825601ff2cce74ebcf51f6297b229c
+guid: a87d79df0fc0ade49a0d5dda2dacf849
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 141e1f4e7a7a66145ab4da274d362f48
+guid: d847c7e75ba17424c9cbca7622ee35b7
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -21,7 +21,7 @@ public class Buff_DownAnger :Buff
     {
         Buff buff = new Buff_DownAnger();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_nuhuo2_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "upperAnger");
         return buff;
     }
 }

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

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

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

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

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

@@ -23,7 +23,7 @@ public class Buff_Firm : Buff
     {
         Buff buff = new Buff_Firm();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_qianggu_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "firm");
         return buff;
     }
 }

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

@@ -27,7 +27,7 @@ public class Buff_Immunity : Buff
     {
         Buff buff = new Buff_Immunity();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_mokang_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "immunity");
         return buff;
     }
 }

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

@@ -11,7 +11,7 @@ public class Buff_Invisible : Buff
     {
         Buff buff = new Buff_Invisible();
         buff.value = value;
-        buff. icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_hunmi_v01");
+        buff. icon = BuffDataManager.Instance.LoadImage(iconPath + "invisible");
         return buff;
     }
 }

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

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

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

@@ -19,7 +19,7 @@ public class Buff_Thorn : Buff
     {
         Buff buff = new Buff_Thorn();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_jingji_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "thorn");
         return buff;
     }
 }

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

@@ -21,7 +21,7 @@ public class Buff_UpperAnger : Buff
     {
         Buff buff = new Buff_UpperAnger();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_nuhuo1_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "upperAnger");
         return buff;
     }
 }

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

@@ -23,7 +23,7 @@ public class Buff_UpperShield : Buff
     {
         Buff buff = new Buff_UpperShield();
         buff.value = value;
-        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_jiangu1_v01");
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "upperShield");
         return buff;
     }
 }

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

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

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

@@ -118,6 +118,10 @@ public class CardEntity : MonoBehaviour
     public Image costImage;
 
     public int tempMinusCost = 0;
+
+    [Header("更改后的带图片的判断条件")]
+    public string colorValSprite = null;
+
     private void Start()
     {
         currentCost = cardOriginalData.Cost;

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

@@ -59,9 +59,6 @@ public class CardOriginalData : System.Object
 
     public HashSet<CoordinateColorPair> cardImageMark;
 
-    //更改后的带图片的判断条件
-    public string colorValSprite;
-
     public string CardId
     {
         get { return cardId; }

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

@@ -6,6 +6,7 @@ using System.Text;
 using System.Text.RegularExpressions;
 using UnityEngine;
 using UnityEngine.UI;
+using UnityEngine.Windows;
 using static Name;
 using Regex = System.Text.RegularExpressions.Regex;
 
@@ -296,17 +297,15 @@ public class CardResourcesManager : Singleton <CardResourcesManager>
 
     public static string StringColorToSprite(string colorVal)
     {
-        Match match = Regex.Match(colorVal, Name.Regex.cardConditionPattern);
-        string firstPart = null;
-        if (match.Success)
-        {
-            HashSet<string> firstPartSet = MathTool.GetRandomElements(new HashSet<string>(Name.Color.PlayerColor), 1);
-            firstPart = firstPartSet.ElementAt(0);    // 第一部分结果
-        }
+        Match match = Regex.Match(colorVal, @"^[^=><]*");
+        string firstPart = match.Value; // 输出结果
+        
         string replacement = null;
+        Debug.Log("颜色头" + firstPart);
         switch (firstPart)
         {
             case Name.SpriteColorString.blue:
+                
                 replacement = "<sprite=2>$2";
                 break;
             case Name.SpriteColorString.aroundblue:

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

@@ -199,7 +199,7 @@ public class GameManager : Singleton<GameManager>
         playerHPinUpUI .text = playerState.currentHP .ToString ()+"/"+ playerState.maxHP.ToString ();
 
         //ͬ²½²½ÊýUI±êʶ
-        if(playerState .currentStepRange != player .stepIconCount )
+       /* if(playerState .currentStepRange != player .stepIconCount )
         {
             for(int i= player.StepIconFather.childCount-1; i>=0;i--)
             {
@@ -212,7 +212,8 @@ public class GameManager : Singleton<GameManager>
                 Instantiate(player.stepIconPrefab, player.StepIconFather);
             }
 
-        }
+        }*/
+
         //ͬ²½Ì«Ñô
         if(complete ==true )
             SyncColourSunUI();
@@ -224,7 +225,8 @@ public class GameManager : Singleton<GameManager>
 
             if (playerOn.whoColour != lastPlayerOn.whoColour)
             {
-                player.ChangeColorAnim();
+                Usermanager.Instance.SufferPlayerOnColorCondition(playerOn.whoColour);
+                //player.ChangeColorAnim();
             }
             lastPlayerOn = playerOn ;  
        }
@@ -234,7 +236,8 @@ public class GameManager : Singleton<GameManager>
 
             if (playerOn.whoColour != lastWhoColor)
             {
-                player.ChangeColorAnim();
+                // player.ChangeColorAnim();
+                Usermanager.Instance.SufferPlayerOnColorCondition(playerOn.whoColour);
             }
             lastWhoColor = playerOn.whoColour;
         }

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

@@ -1,9 +1,7 @@
 using System.Collections.Generic;
-using System.Drawing.Imaging;
 using System.Linq;
 using System.Text;
 using UnityEngine;
-using static Name;
 
 public static class Name
 {
@@ -170,28 +168,28 @@ public static class Name
             getSingleDescription(sb, cardFunAadVal);
         }*/
 
-        getConditionDescription(sb, cardOriginalData);
+        getConditionDescription(sb, cardOriginalData,cardEntity );
 
     }
 
-    public static void getConditionDescription(StringBuilder sb, CardOriginalData cardOriginalData)
+    public static void getConditionDescription(StringBuilder sb, CardOriginalData cardOriginalData,CardEntity cardEntity )
     {
         if (cardOriginalData.condition[0] != Name.none)
         {
             sb.Append(";");
             sb.Append("\n");
             sb.Append("<link=color>");
-            if(cardOriginalData .colorValSprite ==null )
+            if(cardEntity. colorValSprite.Length ==0)
             {        
-                cardOriginalData.colorValSprite = CardResourcesManager.StringColorToSprite(cardOriginalData.condition[0]);
+                cardEntity.colorValSprite = CardResourcesManager.StringColorToSprite(cardOriginalData.condition[0]);
             }
-            if (cardOriginalData.colorValSprite == null)
+            if (cardEntity.colorValSprite.Length == 0)
             {
                 sb.Append(cardOriginalData.condition[0]);     
             }
             else
             {
-                sb.Append(cardOriginalData.colorValSprite);
+                sb.Append(cardEntity.colorValSprite);
             } 
                 
             //sb.Append(cardOriginalData.condition[0]);

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

@@ -4,6 +4,7 @@ using System.Collections.Generic;
 using System.Linq;
 using UnityEngine;
 using UnityEngine.UI;
+using static Name;
 using static UnityEngine.Rendering.DebugUI;
 
 public class Usermanager : Singleton<Usermanager>
@@ -162,6 +163,33 @@ public class Usermanager : Singleton<Usermanager>
 
     }
 
+    public void SufferPlayerOnColorCondition(int onColor)
+    {
+        switch(onColor )
+        {
+            case Name.NodeColor.Red:
+                SufferPlayerAbnormalCondition(AbnormalCondition.Buff_RedNode, 1);
+                break;
+            case Name.NodeColor.Yellow:
+                SufferPlayerAbnormalCondition(AbnormalCondition.Buff_YellowNode, 1);
+                break;
+            case Name.NodeColor.Blue:
+                SufferPlayerAbnormalCondition(AbnormalCondition.Buff_BlueNode, 1);
+                break;
+            case Name.NodeColor.Green: 
+                break;
+            case Name.NodeColor.Black:
+                SufferPlayerAbnormalCondition(AbnormalCondition.Buff_EnemyNode, 1);
+                break;
+            case Name.NodeColor.White:
+                tryRemoveUserAbnormalCondition(AbnormalCondition.Buff_RedNode);
+                tryRemoveUserAbnormalCondition(AbnormalCondition.Buff_YellowNode);
+                tryRemoveUserAbnormalCondition(AbnormalCondition.Buff_BlueNode);
+                tryRemoveUserAbnormalCondition(AbnormalCondition.Buff_EnemyNode);
+                break;
+        }
+        RefreshPlayerBuffIcon();
+    }
     private bool immunityCal(string condition, int value)
     {
         bool isImmunityDispose = false;