Merge pull request '1025BUG修改' (#61) from dev-0524-1025 into dev-0524

Reviewed-on: #61

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

@@ -22,3 +22,4 @@ MonoBehaviour:
   - 1034
   - 1035
   - 1036
+  - 1013

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab

@@ -36,7 +36,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: -12.6}
-  m_SizeDelta: {x: 95.148, y: 20}
+  m_SizeDelta: {x: 120, y: 20}
   m_Pivot: {x: 0.5, y: 0.60132146}
 --- !u!222 &1556748052669264222
 CanvasRenderer:
@@ -97,7 +97,7 @@ MonoBehaviour:
   m_StartCorner: 0
   m_StartAxis: 0
   m_CellSize: {x: 15, y: 15}
-  m_Spacing: {x: -2, y: 0}
+  m_Spacing: {x: -1, y: 0}
   m_Constraint: 2
   m_ConstraintCount: 1
 --- !u!1 &1447975007169538114
@@ -551,7 +551,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.000012636, y: -32.199997}
-  m_SizeDelta: {x: 95.148, y: 20}
+  m_SizeDelta: {x: 110, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3754643477587389603
 CanvasRenderer:
@@ -612,7 +612,7 @@ MonoBehaviour:
   m_StartCorner: 0
   m_StartAxis: 0
   m_CellSize: {x: 15, y: 16}
-  m_Spacing: {x: -2, y: 0}
+  m_Spacing: {x: -1, y: 0}
   m_Constraint: 2
   m_ConstraintCount: 1
 --- !u!1 &5174392397216232880
@@ -745,7 +745,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.000012636, y: -52.52}
-  m_SizeDelta: {x: 95.148, y: 20}
+  m_SizeDelta: {x: 110, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5787701428816686695
 CanvasRenderer:
@@ -806,7 +806,7 @@ MonoBehaviour:
   m_StartCorner: 0
   m_StartAxis: 0
   m_CellSize: {x: 15, y: 16}
-  m_Spacing: {x: -2, y: 0}
+  m_Spacing: {x: -1, y: 0}
   m_Constraint: 2
   m_ConstraintCount: 1
 --- !u!1 &6018557167984620928
@@ -909,16 +909,16 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6052323990296705033}
-  m_LocalRotation: {x: 0, y: 0, z: -0.073499195, w: 0.99729526}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -0}
   m_LocalScale: {x: 0.1, y: 0.12, z: 0.1}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8507021733924720450}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.43}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.6, y: 1.3}
+  m_AnchoredPosition: {x: -0.5, y: 0.6}
   m_SizeDelta: {x: 450, y: 450}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6418759718487919919
@@ -999,7 +999,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.000012636, y: -72.99999}
-  m_SizeDelta: {x: 95.148, y: 20}
+  m_SizeDelta: {x: 110, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6495211555079877352
 CanvasRenderer:
@@ -1060,7 +1060,7 @@ MonoBehaviour:
   m_StartCorner: 0
   m_StartAxis: 0
   m_CellSize: {x: 15, y: 16}
-  m_Spacing: {x: -2, y: 0}
+  m_Spacing: {x: -1, y: 0}
   m_Constraint: 2
   m_ConstraintCount: 1
 --- !u!1 &8081948450419621271
@@ -1177,7 +1177,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
   m_AnchoredPosition: {x: 0, y: -19.7}
-  m_SizeDelta: {x: 90, y: 90}
+  m_SizeDelta: {x: 90, y: 85}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2748996186627099962
 CanvasRenderer:

ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Fun/Val.prefab

@@ -80,7 +80,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -0.00016785, y: 0.0001936}
-  m_SizeDelta: {x: 170, y: 200}
+  m_SizeDelta: {x: 200, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4044046785840339623
 CanvasRenderer:
@@ -123,4 +123,4 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: 15
+  m_Text: 

ColorlessWorld-2024-4-2/Assets/Resources/CardIcon/1001.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 85b4a8fa890967e4e92fc03db88ac159
+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/CardIcon/1002.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 60ba1198d0be60c46be79ce9c771f29c
+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/CardIcon/1003.png.meta

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

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 704b37b2bc7709940b8deeba6239b1f4
+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/CardIcon/2_blue.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 9d7e0332e56bb034ca73a5cc04f6139a
+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/CardIcon/2_green.png.meta

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

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 865569b706287de43aacb3ecf54ad499
+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/CardIcon/3_2blue.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 2344435327b9c3d44a26ebdc96fb81af
+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/CardIcon/3_2green.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: f3ccabbfe0ea14a47833cd7f63611eca
+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/CardIcon/3_2red.png.meta

@@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: cf3f64d94f32b0f4f9a3035ee410d1ee
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -4563,7 +4563,7 @@ MonoBehaviour:
   blueNodeImage: {fileID: 21300000, guid: 260856292e6be62478629aebcd8d10a9, type: 3}
   greenNodeImage: {fileID: 21300000, guid: cc399ccd6a80e2348bd7fecba8788159, type: 3}
   whiteNodeImage: {fileID: 21300000, guid: 9eb1fbe667c110142a3ea9eeb798e869, type: 3}
-  blackNodeImage: {fileID: 21300000, guid: 0974efc85d0f5e4499e4e8268b66cc08, type: 3}
+  blackNodeImage: {fileID: 21300000, guid: cb1d88127e421da4c9be4ce96e438ec7, type: 3}
   attack: {fileID: 2089713304, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
   shield: {fileID: 298242201, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
   step: {fileID: -1638093221, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}

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

@@ -399,10 +399,10 @@ public class CardEntity : MonoBehaviour
 
     private void resultsScreenCal(GameObject father)
     {
-        for (int i = 0; i < cardOriginalData.TrueFunctionVal.Count; i++)
+        foreach (string fun in cardOriginalData.originFunctionVal)
         {
 
-            string keyName = Name.switchNumToString(cardOriginalData.TrueFunctionVal.ElementAt(i).Key);
+            string keyName = Name.switchNumToString(fun);
             string valueName= keyName + Name.value;
             
             GameObject keyChild = father.transform.Find(keyName).GameObject();
@@ -411,16 +411,19 @@ public class CardEntity : MonoBehaviour
             Text description = value.GetComponent<Text>();
             //imageCal(image, cardOriginalData.TrueFunctionVal.ElementAt(i).Key);
             //Debug.Log("cardId是" + cardOriginalData.CardId + "功能是" + cardOriginalData.TrueFunctionVal.ElementAt(i).Key + "数值是" + cardOriginalData.TrueFunctionVal.ElementAt(i).Value);
-            if (int.Parse(cardOriginalData.TrueFunctionVal.ElementAt(i).Value)<=0)
+            //Debug.Log("originFunctionValµÄkeyÊÇ"+ fun);
+            //Debug.Log("originFunctionValµÄvalueÊÇ" + cardOriginalData.originFunctionVal.ElementAt(i).Value);
+            if (cardOriginalData.testTrueFunctionVal.Keys.Contains(fun))
             {
-                keyChild.SetActive(false);
-                valueChild.SetActive(false);
+                keyChild.SetActive(true);
+                valueChild.SetActive(true);
+                description.text = cardOriginalData.testTrueFunctionVal[fun];
+                
             }
             else
             {
-                keyChild.SetActive(true);
-                valueChild.SetActive(true);
-                description.text = cardOriginalData.TrueFunctionVal.ElementAt(i).Value;
+                keyChild.SetActive(false);
+                valueChild.SetActive(false);
             }
         }
     }
@@ -494,6 +497,7 @@ public class CardEntity : MonoBehaviour
                     conditionCal(keys[j], i,j);
                 }
             }
+            CardResourcesManager.Instance.addNullChildToConditon(conditionList[i]);
             createFun(kvp,i);
             
         }
@@ -511,17 +515,18 @@ public class CardEntity : MonoBehaviour
             for (int j = 0; j < functions.Length; j++)
             {
                 Debug.Log("cardId是" + cardOriginalData.CardId + "功能是" + functions[j] + "数值是" + vals[j]);
-                MathTool.AddOrUpdateDictionary(cardOriginalData.originFunctionVal, functions[j], vals[j]);
+                cardOriginalData.originFunctionVal.Add(functions[j]);
             }
             
         }
-        for (int i = 0; i < cardOriginalData.originFunctionVal.Count; i++)
+        foreach (string fun in cardOriginalData.originFunctionVal)
         {
-            string stringKey = Name.switchNumToString(cardOriginalData.originFunctionVal.ElementAt(i).Key);
+            string stringKey = Name.switchNumToString(fun);
+            GameObject text = CardResourcesManager.Instance.addChildToConditon("0", cardDataSummary);
+            text.name = stringKey + Name.value;
             GameObject image=CardResourcesManager.Instance.addChildToConditon(stringKey, cardDataSummary);
             image.name = stringKey;
-            GameObject text = CardResourcesManager.Instance.addChildToConditon(cardOriginalData.originFunctionVal.ElementAt(i).Value, cardDataSummary);
-            text.name = stringKey+Name.value;
+            
         }
     }
 
@@ -532,8 +537,9 @@ public class CardEntity : MonoBehaviour
 
         for (int i = 0; i < functions.Length; i++)
         {
-            CardResourcesManager.Instance.addChildToConditon(Name.switchNumToString(functions[i]), conditionList[index]);
             CardResourcesManager.Instance.addChildToConditon(vals[i], conditionList[index]);
+            CardResourcesManager.Instance.addChildToConditon(Name.switchNumToString(functions[i]), conditionList[index]);
+            
         }
        
         //condition.color = UnityEngine.Color.green;
@@ -596,6 +602,7 @@ public class CardEntity : MonoBehaviour
 
     private void checkAndUpdateCondition()
     {
+        cardOriginalData.testTrueFunctionVal.Clear();
         for (int i = 0; i < cardOriginalData.conditionAndFunctionVal.Count; i++)
         {
             bool isAllMatch=true;
@@ -627,8 +634,18 @@ public class CardEntity : MonoBehaviour
             Image condition = conditionList[i].GetComponent<Image>();
             if (isAllMatch)
             {
+                string value = kvp.Value.Item2;
+                if (int.TryParse(value, out int newValue))
+                {
+                    MathTool.AddOrUpdateDictionary(cardOriginalData.testTrueFunctionVal, kvp.Value.Item1, value);
+                }
+                else
+                {
+                    MathTool.AddOrUpdateDictionary(cardOriginalData.testTrueFunctionVal, kvp.Value.Item1, getNodeTools.getNodesCount(value).ToString());
+                }
+                
                 condition.sprite = successCondition;
-                cardFunToLose.Remove(kvp.Key);
+                cardFunToLose.Remove( kvp.Key);
             }
             else
             {
@@ -636,7 +653,8 @@ public class CardEntity : MonoBehaviour
                 cardFunToLose.TryAdd(kvp.Key, kvp.Value);
             }
         }
-        cardOriginalData.TrueFunctionVal = cardOriginalData.originFunctionVal.ToDictionary(entry => entry.Key, entry => entry.Value);
+        
+        /*cardOriginalData.TrueFunctionVal = cardOriginalData.originFunctionVal.ToDictionary(entry => entry.Key, entry => entry.Value);
         Dictionary<string,string> cardFunToLoseDict=new Dictionary<string,string>();
         foreach (var kvp in cardFunToLose)
         {
@@ -669,7 +687,7 @@ public class CardEntity : MonoBehaviour
                     Console.WriteLine($"键 '{tupleKey}' 的值不是有效的整数，无法更新。");
                 }
             }
-        }
+        }*/
         resultsScreenCal(cardDataSummary);
     }
     private void createCardRelease()

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

@@ -23,6 +23,8 @@ public class CardOriginalData : System.Object
 
     private Dictionary<string, string> trueFunctionVal;
 
+    public Dictionary<string, string> testTrueFunctionVal;
+
     private int carType;
 
     private string description;
@@ -45,7 +47,7 @@ public class CardOriginalData : System.Object
 
     public string[] nodesColor;
 
-    public Dictionary<string, string> originFunctionVal;
+    public HashSet<string> originFunctionVal;
 
     public string CardId
     {

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

@@ -150,7 +150,8 @@ public class CardOriginalDataList : Singleton<CardOriginalDataList>
         cardOriginalData.nodesColor = values[8].Split(";");
         cardOriginalData.conditionAndFunctionVal = new Dictionary<string, Tuple<string, string>>();
         cardOriginalData.TrueFunctionVal = new Dictionary<string, string>();
-        cardOriginalData.originFunctionVal = new Dictionary<string, string>();
+        cardOriginalData.testTrueFunctionVal = new Dictionary<string, string>();
+        cardOriginalData.originFunctionVal = new HashSet<string>();
         cardOriginalData.ImgPath = values[9];
         getDictionaryFromString(values, cardOriginalData);
         

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

@@ -61,6 +61,18 @@ public class CardResourcesManager : Singleton <CardResourcesManager>
         return colorConditonChild;
     }
 
+    public GameObject addNullChildToConditon(GameObject father)
+    {
+        GameObject colorConditonChild;
+        Transform childToCopy = textInCondition.transform;
+        colorConditonChild = Instantiate(textInCondition);
+        colorConditonChild.transform.SetParent(father.transform);
+        colorConditonChild.transform.position = father.transform.position;
+        colorConditonChild.transform.localRotation = childToCopy.localRotation;
+        colorConditonChild.transform.localScale = childToCopy.localScale;
+        return colorConditonChild;
+    }
+
     public bool isTextOrImage(string input)
     {
         return System.Text.RegularExpressions.Regex.IsMatch(input, @"^[><=]|\d+$");

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

@@ -8,32 +8,28 @@ public class EnemyPool : MonoBehaviour
 {
     public static Dictionary<List<string>, float> weakEnemyPool = new Dictionary<List<string>, float>()
     {
-      { new List<string> { EnemyName.ashBeetle,EnemyName.hoodWanderer}, 0.25f },
-      { new List<string> { EnemyName.skullGuardian,EnemyName.skullWarlock}, 0.25f },
-      { new List<string> { EnemyName.blastFistMushroom}, 0.25f },
-      { new List<string> { EnemyName.corrosiveSludge,EnemyName.skullmage}, 0.25f }
+      { new List<string> { Name.EnemyName.Grinfiend,Name.EnemyName.BlackSheep}, 0.33f },
+      { new List<string> { Name.EnemyName.Mushroom,Name.EnemyName.DarkCloud}, 0.33f },
+      { new List<string> { Name.EnemyName.BlackSheep,Name.EnemyName.BlackSheep,Name.EnemyName.BlackSheep}, 0.34f }
     };
 
     public static Dictionary<List<string>, float> strongEnemyPool = new Dictionary<List<string>, float>()
     {
-      { new List<string> { EnemyName.skullGuardian,EnemyName.skullmage,EnemyName.skullWarlock}, 0.245f },
-      { new List<string> { EnemyName.shatteringFistMushroom,EnemyName.blastFistMushroom}, 0.125f },
-      { new List<string> { EnemyName.parasiticMushroom,EnemyName.parasiticMushroom,EnemyName.blastFistMushroom}, 0.125f },
-      { new List<string> { EnemyName.emberWraith,EnemyName.emberWraith,EnemyName.corrosiveSludge}, 0.065f },
-      { new List<string> { EnemyName.ashBeetle,EnemyName.ashBeetle,EnemyName.hoodWanderer,EnemyName.hoodWanderer}, 0.125f },
-      { new List<string> { EnemyName.ashBeetle,EnemyName.skullmage}, 0.125f },
-      { new List<string> { EnemyName.emberWraith,EnemyName.emberWraith,EnemyName.corrosiveSludge}, 0.125f },
-      { new List<string> { EnemyName.blastFistMushroom,EnemyName.skullmage,EnemyName.skullWarlock}, 0.065f }
+      { new List<string> { Name.EnemyName.Grinfiend,Name.EnemyName.BlackSheep,Name.EnemyName.BlackSheep,Name.EnemyName.BlackSheep}, 0.33f },
+      { new List<string> { Name.EnemyName.Mushroom,Name.EnemyName.Mushroom,Name.EnemyName.DarkCloud,Name.EnemyName.DarkCloud}, 0.33f },
+      { new List<string> { Name.EnemyName.Mushroom,Name.EnemyName.BlackSheep,Name.EnemyName.DarkCloud,Name.EnemyName.Grinfiend}, 0.34f }
     };
 
     public static Dictionary<List<string>, float> eliteEnemyPool = new Dictionary<List<string>, float>()
     {
-      { new List<string> { EnemyName.skullGuardian,EnemyName.skullWarlock}, 1.0f },
+      { new List<string> { Name.EnemyName.Polymaw,Name.EnemyName.Grinfiend,Name.EnemyName.Mushroom}, 0.33f },
+      { new List<string> { Name.EnemyName.Polymaw,Name.EnemyName.BlackSheep,Name.EnemyName.DarkCloud}, 0.33f },
+      { new List<string> { Name.EnemyName.Polymaw,Name.EnemyName.Polymaw }, 0.34f }
     };
 
     public static Dictionary<List<string>, float> bossEnemyPool = new Dictionary<List<string>, float>()
     {
-      { new List<string> { EnemyName.skullGuardian,EnemyName.skullmage}, 1.0f },
+      { new List<string> { Name.EnemyName.Polymaw,Name.EnemyName.Grinfiend,Name.EnemyName.BlackSheep,Name.EnemyName.DarkCloud}, 1.0f },
     };
 
 

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler10_1.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 public class EffectRangeHandler10_1 : EffectRangeHandlerBase
 {
     private ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
-    public EffectRangeHandler10_1(MapUnity currentNode, float euler)
+    public EffectRangeHandler10_1(MapUnity currentNode, float euler, CardOriginalData cardOriginalData)
     {
         influencePreviewPool.Clear();
         influencePreviewPool.Add(currentNode);
@@ -14,37 +14,37 @@ public class EffectRangeHandler10_1 : EffectRangeHandlerBase
         {
             { 30.0f, () =>
                {
-                   get10_1Node(currentNode,getOffsetFromEuler(30.0f));
+                   get10_1Node(currentNode,getOffsetFromEuler(30.0f),cardOriginalData);
                    return influencePreviewPool;
                }
             },
             { 90.0f, () =>
                {
-                   get10_1Node(currentNode,getOffsetFromEuler(90.0f));
+                   get10_1Node(currentNode,getOffsetFromEuler(90.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 150.0f, () =>
                {
-                   get10_1Node(currentNode,getOffsetFromEuler(150.0f));
+                   get10_1Node(currentNode,getOffsetFromEuler(150.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 210.0f, () =>
                {
-                   get10_1Node(currentNode,getOffsetFromEuler(210.0f));
+                   get10_1Node(currentNode,getOffsetFromEuler(210.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 270.0f, () =>
                {
-                   get10_1Node(currentNode,getOffsetFromEuler(270.0f));
+                   get10_1Node(currentNode,getOffsetFromEuler(270.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 330.0f, () =>
                {
-                   get10_1Node(currentNode,getOffsetFromEuler(330.0f));
+                   get10_1Node(currentNode,getOffsetFromEuler(330.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             }
@@ -52,9 +52,33 @@ public class EffectRangeHandler10_1 : EffectRangeHandlerBase
 
     }
 
-    private void get10_1Node(MapUnity currentNode, int offset)
+    private void get10_1Node(MapUnity currentNode, int offset, CardOriginalData cardOriginalData)
     {
-        try
+        if (!cardOriginalData.nodesColor[0].Equals(Name.none))
+        {
+            influencePreviewPool.Add(currentNode);
+        }
+        Debug.Log("offsetĘÇ" + offset);
+        for (int i = 0; i < cardOriginalData.nodesMark.Length; i++)
+        {
+            MapUnity endNode = currentNode;
+            try
+            {
+                string[] marks = cardOriginalData.nodesMark[i].Split("_");
+                for (int j = 0; j < marks.Length; j++)
+                {
+                    MapUnity oldNode = endNode;
+                    endNode = oldNode.unitPool[counter.Add(offset, int.Parse(marks[j]))];
+                }
+                if (endNode != null)
+                {
+                    influencePreviewPool.Add(endNode);
+                }
+            }
+            catch (Exception e)
+            { }
+        }
+       /* try
         {
             tryGetNodeInfluencedable(currentNode.unitPool[3]);
             tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3]);
@@ -65,7 +89,7 @@ public class EffectRangeHandler10_1 : EffectRangeHandlerBase
             tryGetNodeInfluencedable(currentNode.unitPool[5]);
             tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]);
             tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5].unitPool[5]);
-            /*tryGetNodeInfluencedable(currentNode.unitPool[3]);
+            *//*tryGetNodeInfluencedable(currentNode.unitPool[3]);
             tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3]);
             tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3].unitPool[3]);
             tryGetNodeInfluencedable(currentNode.unitPool[1]);
@@ -73,13 +97,13 @@ public class EffectRangeHandler10_1 : EffectRangeHandlerBase
             tryGetNodeInfluencedable(currentNode.unitPool[1].unitPool[1].unitPool[1]);
             tryGetNodeInfluencedable(currentNode.unitPool[5]);
             tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]);
-            tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5].unitPool[5]);*/
+            tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5].unitPool[5]);*//*
 
         }
         catch (Exception ex)
         {
             //nothing to do
-        }
+        }*/
 
 
     }

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler11_1.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 public class EffectRangeHandler11_1 : EffectRangeHandlerBase
 {
     private ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
-    public EffectRangeHandler11_1(MapUnity currentNode, float euler)
+    public EffectRangeHandler11_1(MapUnity currentNode, float euler, CardOriginalData cardOriginalData)
     {
         influencePreviewPool.Clear();
         influencePreviewPool.Add(currentNode);
@@ -14,37 +14,37 @@ public class EffectRangeHandler11_1 : EffectRangeHandlerBase
         {
             { 30.0f, () =>
                {
-                   get11_1Node(currentNode,getOffsetFromEuler(30.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(30.0f),cardOriginalData);
                    return influencePreviewPool;
                }
             },
             { 90.0f, () =>
                {
-                   get11_1Node(currentNode,getOffsetFromEuler(90.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(90.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 150.0f, () =>
                {
-                   get11_1Node(currentNode,getOffsetFromEuler(150.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(150.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 210.0f, () =>
                {
-                   get11_1Node(currentNode,getOffsetFromEuler(210.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(210.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 270.0f, () =>
                {
-                   get11_1Node(currentNode,getOffsetFromEuler(270.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(270.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 330.0f, () =>
                {
-                   get11_1Node(currentNode,getOffsetFromEuler(330.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(330.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             }

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler13_1.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 public class EffectRangeHandler13_1 : EffectRangeHandlerBase
 {
     private ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
-    public EffectRangeHandler13_1(MapUnity currentNode, float euler)
+    public EffectRangeHandler13_1(MapUnity currentNode, float euler,CardEntity cardEntity)
     {
         influencePreviewPool.Clear();
         influencePreviewPool.Add(currentNode);
@@ -14,37 +14,37 @@ public class EffectRangeHandler13_1 : EffectRangeHandlerBase
         {
             { 30.0f, () =>
                {
-                   get13_1Node(currentNode,getOffsetFromEuler(30.0f));
+                   get13_1Node(currentNode,getOffsetFromEuler(30.0f),cardEntity.cardOriginalData);
                    return influencePreviewPool;
                }
             },
             { 90.0f, () =>
                {
-                   get13_1Node(currentNode,getOffsetFromEuler(90.0f));
+                   get13_1Node(currentNode,getOffsetFromEuler(90.0f),cardEntity.cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 150.0f, () =>
                {
-                   get13_1Node(currentNode,getOffsetFromEuler(150.0f));
+                   get13_1Node(currentNode,getOffsetFromEuler(150.0f),cardEntity.cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 210.0f, () =>
                {
-                   get13_1Node(currentNode,getOffsetFromEuler(210.0f));
+                   get13_1Node(currentNode,getOffsetFromEuler(210.0f),cardEntity.cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 270.0f, () =>
                {
-                   get13_1Node(currentNode,getOffsetFromEuler(270.0f));
+                   get13_1Node(currentNode,getOffsetFromEuler(270.0f),cardEntity.cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 330.0f, () =>
                {
-                   get13_1Node(currentNode,getOffsetFromEuler(330.0f));
+                   get13_1Node(currentNode,getOffsetFromEuler(330.0f),cardEntity.cardOriginalData);
                    return influencePreviewPool;
                 }
             }
@@ -52,10 +52,40 @@ public class EffectRangeHandler13_1 : EffectRangeHandlerBase
 
     }
 
-    private void get13_1Node(MapUnity currentNode, int offset)
+    private void get13_1Node(MapUnity currentNode, int offset,CardOriginalData cardOriginalData)
     {
-        try
+        if (!cardOriginalData.nodesColor[0].Equals(Name.none))
         {
+            influencePreviewPool.Add(currentNode);
+        }
+        Debug.Log("offsetĘÇ" + offset);
+        for (int i = 0; i < cardOriginalData.nodesMark.Length; i++)
+        {
+            MapUnity endNode = currentNode;
+            try
+            {
+                string[] marks = cardOriginalData.nodesMark[i].Split("_");
+                for (int j = 0; j < marks.Length; j++)
+                {
+                    MapUnity oldNode = endNode;
+                    endNode = oldNode.unitPool[counter.Add(offset, int.Parse(marks[j]))];
+                }
+                if (endNode != null)
+                {
+                    influencePreviewPool.Add(endNode);
+                }
+            }
+            catch (Exception e)
+            {}
+        }
+
+        /*try
+        {
+            tryGetNodeInfluencedable(currentNode.unitPool[5]);
+            tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]);
+            tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5].unitPool[5]);
+            tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]
+                .unitPool[5].unitPool[4]);
             tryGetNodeInfluencedable(currentNode.unitPool[3]);
             tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3]);
             tryGetNodeInfluencedable(currentNode.unitPool[3].unitPool[3].unitPool[3]);
@@ -66,17 +96,11 @@ public class EffectRangeHandler13_1 : EffectRangeHandlerBase
             tryGetNodeInfluencedable(currentNode.unitPool[1].unitPool[1].unitPool[1]);
             tryGetNodeInfluencedable(currentNode.unitPool[1].unitPool[1]
                 .unitPool[1].unitPool[0]);
-            tryGetNodeInfluencedable(currentNode.unitPool[5]);
-            tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]);
-            tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5].unitPool[5]);
-            tryGetNodeInfluencedable(currentNode.unitPool[5].unitPool[5]
-                .unitPool[5].unitPool[4]);
-
         }
-        catch (Exception ex)
+        catch (Exception e)
         {
-            //nothing to do
-        }
+        }*/
+
 
 
     }

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler14_1.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 public class EffectRangeHandler14_1 : EffectRangeHandlerBase
 {
     private ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
-    public EffectRangeHandler14_1(MapUnity currentNode, float euler)
+    public EffectRangeHandler14_1(MapUnity currentNode, float euler, CardOriginalData cardOriginalData)
     {
         influencePreviewPool.Clear();
         influencePreviewPool.Add(currentNode);
@@ -14,37 +14,37 @@ public class EffectRangeHandler14_1 : EffectRangeHandlerBase
         {
             { 30.0f, () =>
                {
-                   get14_1Node(currentNode,getOffsetFromEuler(30.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(30.0f),cardOriginalData);
                    return influencePreviewPool;
                }
             },
             { 90.0f, () =>
                {
-                   get14_1Node(currentNode,getOffsetFromEuler(90.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(90.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 150.0f, () =>
                {
-                   get14_1Node(currentNode,getOffsetFromEuler(150.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(150.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 210.0f, () =>
                {
-                   get14_1Node(currentNode,getOffsetFromEuler(210.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(210.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 270.0f, () =>
                {
-                   get14_1Node(currentNode,getOffsetFromEuler(270.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(270.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 330.0f, () =>
                {
-                   get14_1Node(currentNode,getOffsetFromEuler(330.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(330.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             }

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler8_4.cs

@@ -6,7 +6,7 @@ using UnityEngine;
 public class EffectRangeHandler8_4 : EffectRangeHandlerBase
 {
     private ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
-    public EffectRangeHandler8_4(MapUnity currentNode, float euler)
+    public EffectRangeHandler8_4(MapUnity currentNode, float euler, CardOriginalData cardOriginalData)
     {
         influencePreviewPool.Clear();
         influencePreviewPool.Add(currentNode);
@@ -14,37 +14,37 @@ public class EffectRangeHandler8_4 : EffectRangeHandlerBase
         {
             { 30.0f, () =>
                {
-                   get8_4Node(currentNode,getOffsetFromEuler(30.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(30.0f), cardOriginalData);
                    return influencePreviewPool;
                }
             },
             { 90.0f, () =>
                {
-                   get8_4Node(currentNode,getOffsetFromEuler(90.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(90.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 150.0f, () =>
                {
-                   get8_4Node(currentNode,getOffsetFromEuler(150.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(150.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 210.0f, () =>
                {
-                   get8_4Node(currentNode,getOffsetFromEuler(210.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(210.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 270.0f, () =>
                {
-                   get8_4Node(currentNode,getOffsetFromEuler(270.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(270.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 330.0f, () =>
                {
-                   get8_4Node(currentNode,getOffsetFromEuler(330.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(330.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             }

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandler9_1.cs

@@ -5,8 +5,8 @@ using UnityEngine;
 
 public class EffectRangeHandler9_1 : EffectRangeHandlerBase
 {
-    private ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
-    public EffectRangeHandler9_1(MapUnity currentNode, float euler)
+    
+    public EffectRangeHandler9_1(MapUnity currentNode, float euler,CardOriginalData cardOriginalData)
     {
         influencePreviewPool.Clear();
         influencePreviewPool.Add(currentNode);
@@ -14,37 +14,37 @@ public class EffectRangeHandler9_1 : EffectRangeHandlerBase
         {
             { 30.0f, () =>
                {
-                   get9_1Node(currentNode,getOffsetFromEuler(30.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(30.0f),cardOriginalData);
                    return influencePreviewPool;
                }
             },
             { 90.0f, () =>
                {
-                   get9_1Node(currentNode,getOffsetFromEuler(90.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(90.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 150.0f, () =>
                {
-                   get9_1Node(currentNode,getOffsetFromEuler(150.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(150.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 210.0f, () =>
                {
-                   get9_1Node(currentNode,getOffsetFromEuler(210.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(210.0f),cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 270.0f, () =>
                {
-                   get9_1Node(currentNode,getOffsetFromEuler(270.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(270.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             },
             { 330.0f, () =>
                {
-                   get9_1Node(currentNode,getOffsetFromEuler(330.0f));
+                   getNodeByCard(currentNode,getOffsetFromEuler(330.0f), cardOriginalData);
                    return influencePreviewPool;
                 }
             }
@@ -60,10 +60,10 @@ public class EffectRangeHandler9_1 : EffectRangeHandlerBase
             tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)]);
             tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)]);
             tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)]);
-            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(1, offset)]);
-            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(5, offset)]);
-            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(1, offset)].unitPool[counter.Add(1, offset)]);
-            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(5, offset)].unitPool[counter.Add(5, offset)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(2, offset)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(4, offset)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(2, offset)].unitPool[counter.Add(1, offset)]);
+            tryGetNodeInfluencedable(currentNode.unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(3, offset)].unitPool[counter.Add(4, offset)].unitPool[counter.Add(5, offset)]);
         }
         catch (Exception ex)
         {

ColorlessWorld-2024-4-2/Assets/Scripts/Handler/EffectRangeHandlerBase.cs

@@ -2,9 +2,11 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using static UnityEditor.Experimental.AssetDatabaseExperimental.AssetDatabaseCounters;
 
 public  class EffectRangeHandlerBase : EffectRangeHandler
 {
+    public ZeroToFiveCircularCounter counter = new ZeroToFiveCircularCounter();
     public HashSet<MapUnity> influencePreviewPool = new HashSet<MapUnity>();//¿¨ÅƵÄÓ°Ï췶Χ
 
     public Dictionary<float, Func<HashSet<MapUnity>>> angleActions;
@@ -13,24 +15,31 @@ public  class EffectRangeHandlerBase : EffectRangeHandler
     public bool tryGetNodeInfluencedable(MapUnity currentNode) 
     {
         bool canPass = true;
-        if (currentNode == null)
+        try
         {
-            canPass = false;
-            return canPass;
-        }
-        /*if (currentNode.TryGetComponent<EnemyNode>(out EnemyNode enemyNode))*/
-        if (currentNode.enemyNode!=null)
-        {
-            if (currentNode.enemyNode.enemyType.Equals(EnemyNode.EnemyType.block))
+            if (currentNode == null)
             {
                 canPass = false;
+                return canPass;
+            }
+            /*if (currentNode.TryGetComponent<EnemyNode>(out EnemyNode enemyNode))*/
+            if (currentNode.enemyNode != null)
+            {
+                if (currentNode.enemyNode.enemyType.Equals(EnemyNode.EnemyType.block))
+                {
+                    canPass = false;
+                    influencePreviewPool.Add(currentNode);
+                }
+            }
+
+            if (canPass)
+            {
                 influencePreviewPool.Add(currentNode);
             }
         }
-
-        if (canPass)
+        catch (Exception e)
         {
-            influencePreviewPool.Add(currentNode);
+            canPass=false;
         }
         return canPass;
     }
@@ -56,21 +65,50 @@ public  class EffectRangeHandlerBase : EffectRangeHandler
         return offset;
     }
 
-
-    /*public bool tryGetNodeFromEulerAndBase(MapUnity currentNode,float euler,int baseNum)
+    public void getNodeByCard(MapUnity currentNode, int offset, CardOriginalData cardOriginalData)
     {
-        int 
-        bool canPass = true;
-        switch (euler) 
+        int trueoffset = counter.Add(offset, 3);
+        if (!cardOriginalData.nodesColor[0].Equals(Name.none))
         {
-            case 30.0f:
-
+            influencePreviewPool.Add(currentNode);
         }
+        Debug.Log("offsetÊÇ" + offset);
+        for (int i = 0; i < cardOriginalData.nodesMark.Length; i++)
+        {
+            MapUnity endNode = currentNode;
+            try
+            {
+                string[] marks = cardOriginalData.nodesMark[i].Split("_");
+                for (int j = 0; j < marks.Length; j++)
+                {
+                    MapUnity oldNode = endNode;
+                    endNode = oldNode.unitPool[counter.Add(trueoffset, int.Parse(marks[j]))];
+                }
+                if (endNode != null)
+                {
+                    influencePreviewPool.Add(endNode);
+                }
+            }
+            catch (Exception e)
+            { }
+        }
+    }
 
-        return canPass;
-    }*/
 
-    public HashSet<MapUnity> HandleAngleWithResult(float angle)
+        /*public bool tryGetNodeFromEulerAndBase(MapUnity currentNode,float euler,int baseNum)
+        {
+            int 
+            bool canPass = true;
+            switch (euler) 
+            {
+                case 30.0f:
+
+            }
+
+            return canPass;
+        }*/
+
+        public HashSet<MapUnity> HandleAngleWithResult(float angle)
     {
         foreach (var kvp in angleActions)
         {

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

@@ -90,9 +90,10 @@ public class MapManager : Singleton<MapManager>
         }
        
     }
-    public void test()
+    public void enemyBurn(string enemyPool)
     {
-        List<string> enemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.strongEnemyPool);
+        List<string> enemyList = new List<string>();
+        enemyList = EnemyPool.GetRandomEnemyPool(EnemyPool.strongEnemyPool);
         foreach (string a in enemyList)
         {
             Debug.Log("怪物是" + a);
@@ -112,7 +113,7 @@ public class MapManager : Singleton<MapManager>
 #if UNITY_EDITOR
             enemyListTest = EnemyPool.getEnemyPrefab(enemyList);
 #endif
-            mapSet = MathTool.GetRandomElements(getNodeTools.getAllNodesExceptEnemyAndPlayer(), enemyListTest.Count);
+            mapSet = MathTool.GetRandomElements(getNodeTools.getEnemyBurnNodes(), enemyListTest.Count);
             mapList = new List<MapUnity>(mapSet);
 
             foreach (var node in mapList )
@@ -155,8 +156,8 @@ public class MapManager : Singleton<MapManager>
         bookAnim.GetComponent<Animator>().SetTrigger("move");
         //书缝愈合
         bookUpAnim.SetActive(true);
-        
-        //test();
+
+        enemyBurn();
     }
     //总动画控制进程
     public void ContinueProgress()

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

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using UnityEngine;
 public static class Name
 {
     public static class Target
@@ -11,6 +12,23 @@ public static class Name
     
     public const string none="none";
 
+    public static class EnemyName
+    {
+        public const string DarkCloud = "DarkCloud";
+        public const string Grinfiend = "Grinfiend";
+        public const string Mushroom = "Mushroom";
+        public const string Polymaw = "Polymaw";
+        public const string BlackSheep = "BlackSheep";
+    }
+
+    public static class EnemyPool
+    {
+        public const string Weak = "weak";
+        public const string Strong = "strong";
+        public const string Elite = "elite";
+        public const string Boss = "Boss";
+    }
+
     public const string value = "value";
     public static class Legacy
     {

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

@@ -137,6 +137,19 @@ public class getNodeTools
         return set;
     }
 
+    public static HashSet<MapUnity> getEnemyBurnNodes()
+    {
+        HashSet<MapUnity> set = new HashSet<MapUnity>();
+        for (int i = 0; i < GameManager.Instance.X.Count; i++)
+        {
+            for (int j = GameManager.Instance.X[i].Y.Count - 2; j < GameManager.Instance.X[i].Y.Count; j++)
+            {
+                set.Add(GameManager.Instance.X[i].Y[j]);
+            }
+        }
+        return set;
+    }
+
     public static HashSet<MapUnity> getAllPlayerNodes()
     {
         HashSet<MapUnity> set = new HashSet<MapUnity>();
@@ -579,13 +592,13 @@ public class getNodeTools
             {EffectRange.range8_1,new EffectRangeHandler8_1(currentNode,euler) },
             {EffectRange.range8_2,new EffectRangeHandler8_2(playerOnNode,euler) },
             {EffectRange.range8_3,new EffectRangeHandler8_3(currentNode,euler) },
-            {EffectRange.range8_4,new EffectRangeHandler8_4(currentNode,euler) },
-            {EffectRange.range9_1,new EffectRangeHandler9_1(currentNode,euler) },
-            {EffectRange.range10_1,new EffectRangeHandler10_1(playerOnNode,euler) },
+            {EffectRange.range8_4,new EffectRangeHandler8_4(currentNode,euler,cardEntity.cardOriginalData) },
+            {EffectRange.range9_1,new EffectRangeHandler9_1(currentNode,euler,cardEntity.cardOriginalData) },
+            {EffectRange.range10_1,new EffectRangeHandler10_1(playerOnNode,euler,cardEntity.cardOriginalData)},
             {EffectRange.range10_2,new EffectRangeHandler10_2(currentNode,euler) },
-            {EffectRange.range11_1,new EffectRangeHandler11_1(currentNode,euler) },
-            {EffectRange.range13_1,new EffectRangeHandler13_1(playerOnNode,euler) },
-            {EffectRange.range14_1,new EffectRangeHandler14_1(currentNode,euler) },
+            {EffectRange.range11_1,new EffectRangeHandler11_1(currentNode,euler,cardEntity.cardOriginalData) },
+            {EffectRange.range13_1,new EffectRangeHandler13_1(playerOnNode,euler,cardEntity) },
+            {EffectRange.range14_1,new EffectRangeHandler14_1(currentNode,euler,cardEntity.cardOriginalData) },
             {EffectRange.range18_1,new EffectRangeHandler18_1(playerOnNode,euler) },
         };
 

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

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using Unity.VisualScripting;
@@ -51,17 +52,23 @@ public class SettlementManager : Singleton<SettlementManager>
         for (int i = 0; i < cardOriginalData.nodesMark.Length; i++)
         {
             MapUnity endNode = targetNode;
-            string[] marks= cardOriginalData.nodesMark[i].Split("_");
-            for (int j = 0; j < marks.Length; j++)
-            {
-                MapUnity oldNode = endNode;
-                endNode = oldNode.unitPool[counter.Add(offset, int.Parse(marks[j]))];
-            }
-            if (endNode != null)
+            try {
+                string[] marks = cardOriginalData.nodesMark[i].Split("_");
+                for (int j = 0; j < marks.Length; j++)
+                {
+                    MapUnity oldNode = endNode;
+                    endNode = oldNode.unitPool[counter.Add(offset, int.Parse(marks[j]))];
+                }
+                if (endNode != null)
+                {
+                    endNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[i + 1]));
+                }
+            }catch(Exception e)
             {
-                endNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[i + 1]));
+
             }
-         }
+            
+        }
     }
 
     private int getEulerOffset(int offset, float euler)
@@ -425,7 +432,7 @@ public class SettlementManager : Singleton<SettlementManager>
         }
         else
         {*/
-            trueFunctionVal.AddRange(cardOriginalData.TrueFunctionVal);
+            trueFunctionVal.AddRange(cardOriginalData.testTrueFunctionVal);
         foreach (KeyValuePair<string, string> kvp in trueFunctionVal)
         {
             Debug.Log("½áËãÁË" + kvp.Key);

ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_3.csv

@@ -26,3 +26,7 @@
 1034,2,0,18_1,blue>6;green>6,1;2,blue;green,0;1;-1;-2;2;3;0_0;0_-1;0_1;-1_-1;1_1;-1_-2;1_2;-2_-2;2_2;3_-2;3_2;3_3,none;black;black;black;black;black;black;blue;green;green;blue;blue;green;green;blue;blue;green;green;blue,CardIcon/1034
 1035,2,0,18_1,green>6;red>6,1;11,red;1,0;1;-1;-2;2;3;0_0;0_-1;0_1;-1_-1;1_1;-1_-2;1_2;-2_-2;2_2;3_-2;3_2;3_3,none;black;black;black;black;black;black;red;green;green;red;red;green;green;red;red;green;green;red,CardIcon/1035
 1036,2,0,18_1,red>6;blue>6,25;12,9;3,0;1;-1;-2;2;3;0_0;0_-1;0_1;-1_-1;1_1;-1_-2;1_2;-2_-2;2_2;3_-2;3_2;3_3,none;black;black;black;black;black;black;red;blue;blue;red;red;blue;blue;red;red;blue;blue;red,CardIcon/1036
+1001,1,2,2,none,1,5,0,white;white,CardIcon/1001
+1002,1,1,3_1,none,2,4,0;0_0,white;white;white,CardIcon/1002
+1003,2,1,4_1,white>8,1,9,0;0_0;0_0_0,white;white;white;white,CardIcon/1003
+1004,2,2,3_2,white>5,2,8,2;-2,white;white;white,CardIcon/1004