Merge pull request 'dev-1024' (#60) from dev-1024 into dev-0524

Reviewed-on: #60
1 year ago · 5a2261721a
39 changed files with 3362 additions and 865 deletions
--- a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png
+++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png
--- a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png.meta
+++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/1111111.png.meta
@ -0,0 +1,149 @@
+fileFormatVersion: 2
+guid: 7eec0ec9fd6052f4da1721b15cb450c5
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: 1111111_0
+      rect:
+        serializedVersion: 2
+        x: 22
+        y: 25
+        width: 247
+        height: 281
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 2dbc374697562f54d81c82808b8ef7bd
+      internalID: 1826802122
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 8a8f510a62183be4389dc7b9da55dc81
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable:
+      1111111_0: 1826802122
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/card.png.meta
+++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/card.png.meta
@ -43,7 +43,7 @@ TextureImporter:
  nPOTScale: 0
  lightmap: 0
  compressionQuality: 50
-  spriteMode: 1
+  spriteMode: 2
  spriteExtrude: 1
  spriteMeshType: 1
  alignment: 0
@ -108,7 +108,28 @@ TextureImporter:
    forceMaximumCompressionQuality_BC6H_BC7: 0
  spriteSheet:
    serializedVersion: 2
-    sprites: []
+    sprites:
+    - serializedVersion: 2
+      name: card_0
+      rect:
+        serializedVersion: 2
+        x: 60
+        y: 34
+        width: 512
+        height: 771
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 6b02cfecdfbb72644a5e41951d5783ee
+      internalID: -1380875850
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
    outline: []
    physicsShape: []
    bones: []
@ -119,7 +140,8 @@ TextureImporter:
    edges: []
    weights: []
    secondaryTextures: []
-    nameFileIdTable: {}
+    nameFileIdTable:
+      card_0: -1380875850
  mipmapLimitGroupName: 
  pSDRemoveMatte: 0
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/conditon.png.meta
+++ b/ColorlessWorld-2024-4-2/Assets/ArtAssets/Card/UI/v05/conditon.png.meta
@ -118,8 +118,8 @@ TextureImporter:
        width: 386
        height: 72
      alignment: 0
-      pivot: {x: 0, y: 0}
-      border: {x: 0, y: 0, z: 0, w: 0}
+      pivot: {x: 0.5, y: 0.5}
+      border: {x: 6, y: 7, z: 5, w: 9}
      outline: []
      physicsShape: []
      tessellationDetail: 0
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset
@ -23,4 +23,4 @@ MonoBehaviour:
  currentHP: 68
  cardRewardNumToChoose: 0
  cardRewardNumToGget: 0
-  money: 100
+  money: 9900
--- a/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png
+++ b/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png
--- a/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Image/新商店UI/企业微信截图_17297755714270.png.meta
@ -0,0 +1,127 @@
+fileFormatVersion: 2
+guid: 5ff0e472e77d92047aaf4e4de3f60eb6
+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: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab
@ -35,7 +35,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 3.274, y: -10.174}
+  m_AnchoredPosition: {x: 0, y: -12.6}
  m_SizeDelta: {x: 95.148, y: 20}
  m_Pivot: {x: 0.5, y: 0.60132146}
 --- !u!222 &1556748052669264222
@ -60,7 +60,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@ -89,17 +89,17 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Padding:
-    m_Left: 0
+    m_Left: 5
    m_Right: 0
-    m_Top: 0
+    m_Top: -2
    m_Bottom: 0
  m_ChildAlignment: 4
  m_StartCorner: 0
  m_StartAxis: 0
-  m_CellSize: {x: 15, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_CellSize: {x: 15, y: 15}
+  m_Spacing: {x: -2, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 1
 --- !u!1 &1447975007169538114
 GameObject:
  m_ObjectHideFlags: 0
@ -135,8 +135,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -4.3, y: 6.8}
-  m_SizeDelta: {x: 28.6048, y: 33.2259}
+  m_AnchoredPosition: {x: -13.4, y: 14}
+  m_SizeDelta: {x: 45, y: 45}
  m_Pivot: {x: 0, y: 1}
 --- !u!222 &3908379299743407417
 CanvasRenderer:
@ -162,7 +162,7 @@ MonoBehaviour:
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
@ -208,11 +208,11 @@ RectTransform:
  m_Children: []
  m_Father: {fileID: 7139562062302679022}
  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: 5.6716, y: 90.187}
-  m_SizeDelta: {x: 94.795, y: 18.142}
-  m_Pivot: {x: 0.50000066, y: 0.5}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0.000024318695, y: -1.5}
+  m_SizeDelta: {x: 100, y: 20}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &5689823300698625128
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -236,15 +236,15 @@ MonoBehaviour:
  m_Padding:
    m_Left: 0
    m_Right: 0
-    m_Top: -1
+    m_Top: 0
    m_Bottom: 0
  m_ChildAlignment: 4
  m_StartCorner: 0
  m_StartAxis: 0
-  m_CellSize: {x: 20, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_CellSize: {x: 23, y: 25}
+  m_Spacing: {x: 3, y: 0}
+  m_Constraint: 1
+  m_ConstraintCount: 5
 --- !u!1 &4169693119190854323
 GameObject:
  m_ObjectHideFlags: 0
@ -294,7 +294,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: -3.1, y: 29}
-  m_SizeDelta: {x: 125, y: 200}
+  m_SizeDelta: {x: 132, y: 200}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &806089455888247474
 CanvasRenderer:
@ -317,14 +317,14 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
  m_RaycastTarget: 1
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3}
+  m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -437,7 +437,7 @@ MonoBehaviour:
  speed: 4
  moveOffset: 50
  originPoint: {x: 0, y: 0, z: 0}
-  UpperOffset: {x: 0, y: 70, z: 0}
+  UpperOffset: {x: 0, y: 115, z: 0}
  originRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &4343990849769966524
 GameObject:
@ -472,11 +472,11 @@ RectTransform:
  - {fileID: 4872235896629707279}
  m_Father: {fileID: 7139562062302679022}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: -5.2, y: -175.1}
-  m_SizeDelta: {x: 28.6048, y: 33.2259}
-  m_Pivot: {x: 0, y: 1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -13.4, y: -7.52}
+  m_SizeDelta: {x: 45, y: 45}
+  m_Pivot: {x: 0, y: 0}
 --- !u!222 &9073797113623819660
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -501,7 +501,7 @@ MonoBehaviour:
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
@ -550,8 +550,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 3.8999996, y: -32.199997}
-  m_SizeDelta: {x: 90, y: 20}
+  m_AnchoredPosition: {x: -0.000012636, y: -32.199997}
+  m_SizeDelta: {x: 95.148, y: 20}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3754643477587389603
 CanvasRenderer:
@ -575,7 +575,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@ -608,13 +608,13 @@ MonoBehaviour:
    m_Right: 0
    m_Top: -1
    m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
  m_StartCorner: 0
  m_StartAxis: 0
-  m_CellSize: {x: 15, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_CellSize: {x: 15, y: 16}
+  m_Spacing: {x: -2, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 1
 --- !u!1 &5174392397216232880
 GameObject:
  m_ObjectHideFlags: 0
@ -744,8 +744,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 3.9, y: -52.52}
-  m_SizeDelta: {x: 90, y: 20}
+  m_AnchoredPosition: {x: -0.000012636, y: -52.52}
+  m_SizeDelta: {x: 95.148, y: 20}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5787701428816686695
 CanvasRenderer:
@ -769,7 +769,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@ -802,13 +802,13 @@ MonoBehaviour:
    m_Right: 0
    m_Top: -1
    m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
  m_StartCorner: 0
  m_StartAxis: 0
-  m_CellSize: {x: 15, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_CellSize: {x: 15, y: 16}
+  m_Spacing: {x: -2, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 1
 --- !u!1 &6018557167984620928
 GameObject:
  m_ObjectHideFlags: 0
@ -843,8 +843,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 1.1, y: 0.8}
-  m_SizeDelta: {x: 132.8754, y: 214.2679}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 132, y: 200}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6630524511444619868
 CanvasRenderer:
@ -870,11 +870,11 @@ MonoBehaviour:
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3}
+  m_Sprite: {fileID: -1380875850, guid: cd0ed17b6a2a22740bafd80ed9f139f6, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -909,17 +909,17 @@ RectTransform:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6052323990296705033}
-  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.1, z: 0.1}
+  m_LocalRotation: {x: 0, y: 0, z: -0.073499195, w: 0.99729526}
+  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: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -8.43}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.60999966, y: -0.00002861023}
-  m_SizeDelta: {x: 250, y: 250}
+  m_AnchoredPosition: {x: -1.6, y: 1.3}
+  m_SizeDelta: {x: 450, y: 450}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6418759718487919919
 CanvasRenderer:
@ -945,12 +945,12 @@ MonoBehaviour:
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
    m_FontSize: 170
    m_FontStyle: 0
    m_BestFit: 0
@ -998,8 +998,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 3.9, y: -72.99999}
-  m_SizeDelta: {x: 90, y: 20}
+  m_AnchoredPosition: {x: -0.000012636, y: -72.99999}
+  m_SizeDelta: {x: 95.148, y: 20}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6495211555079877352
 CanvasRenderer:
@ -1023,7 +1023,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@ -1056,13 +1056,13 @@ MonoBehaviour:
    m_Right: 0
    m_Top: -1
    m_Bottom: 0
-  m_ChildAlignment: 0
+  m_ChildAlignment: 4
  m_StartCorner: 0
  m_StartAxis: 0
-  m_CellSize: {x: 15, y: 20}
-  m_Spacing: {x: 0, y: 0}
-  m_Constraint: 0
-  m_ConstraintCount: 2
+  m_CellSize: {x: 15, y: 16}
+  m_Spacing: {x: -2, y: 0}
+  m_Constraint: 2
+  m_ConstraintCount: 1
 --- !u!1 &8081948450419621271
 GameObject:
  m_ObjectHideFlags: 0
@ -1097,8 +1097,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0.6999998, y: -0.39999962}
-  m_SizeDelta: {x: 250, y: 250}
+  m_AnchoredPosition: {x: -2.1000004, y: 0.00001335144}
+  m_SizeDelta: {x: 450, y: 450}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7985228304631699869
 CanvasRenderer:
@ -1121,20 +1121,20 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.3679245, g: 0.3679245, b: 0.3679245, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 170
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
+    m_FontSize: 200
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 1
-    m_MaxSize: 187
+    m_MaxSize: 200
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
@ -1174,11 +1174,11 @@ RectTransform:
  m_Children: []
  m_Father: {fileID: 7139562062302679022}
  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: 3.274, y: 40.8}
+  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_Pivot: {x: 0.5, y: 0.5}
+  m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &2748996186627099962
 CanvasRenderer:
  m_ObjectHideFlags: 0
@ -1203,11 +1203,11 @@ MonoBehaviour:
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 0
+  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 8a22e3267925107428c362e702d2c792, type: 3}
+  m_Sprite: {fileID: 677644212, guid: c0cdeb5700cf9a440a32d3f1466d5f75, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04.3-Common.prefab
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: aca792d113461d44a8227dffd169496d
+guid: d349e9c2ce0a808418c6eed487637259
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop/Card_v02_OnlyChooseUI.prefab
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.3-Common.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForReward/Card_v04.3-Common.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bde7b0a7c5fcf7145b84c1f52cb5dabc
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Fun/NodeForSummary.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Fun/NodeForSummary.prefab
@ -31,12 +31,13 @@ RectTransform:
  m_ConstrainProportionsScale: 1
  m_Children:
  - {fileID: 8458917067245679644}
+  - {fileID: 7939080871448022204}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 7, y: -7.9000244}
-  m_SizeDelta: {x: 7.5, y: 7.5}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 23, y: 25}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &819172502198749263
 CanvasRenderer:
@ -60,7 +61,7 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
@ -111,7 +112,7 @@ RectTransform:
  m_AnchorMin: {x: 0.5, y: 0.5}
  m_AnchorMax: {x: 0.5, y: 0.5}
  m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 100, y: 100}
+  m_SizeDelta: {x: 230, y: 250}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4042538890853660972
 CanvasRenderer:
@ -135,19 +136,19 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
+  m_RaycastTarget: 0
  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 80
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
+    m_FontSize: 160
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 0
-    m_MaxSize: 220
+    m_MaxSize: 300
    m_Alignment: 4
    m_AlignByGeometry: 0
    m_RichText: 1
@ -155,3 +156,78 @@ MonoBehaviour:
    m_VerticalOverflow: 0
    m_LineSpacing: 1
  m_Text: 1
+--- !u!1 &3091641592789669261
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7939080871448022204}
+  - component: {fileID: 5048468929479509903}
+  - component: {fileID: 6174348204424421663}
+  m_Layer: 0
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7939080871448022204
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3091641592789669261}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8352083469037628100}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5048468929479509903
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3091641592789669261}
+  m_CullTransparentMesh: 1
+--- !u!114 &6174348204424421663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3091641592789669261}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 1826802122, guid: 7eec0ec9fd6052f4da1721b15cb450c5, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/CardSaleNode.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/CardSaleNode.prefab
@ -66,7 +66,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 5ff0e472e77d92047aaf4e4de3f60eb6, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
@ -221,7 +221,7 @@ MonoBehaviour:
    m_PersistentCalls:
      m_Calls: []
  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
    m_FontSize: 30
    m_FontStyle: 0
    m_BestFit: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/Shop/RelicSaleNode.prefab
@ -66,7 +66,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_Sprite: {fileID: 0}
+  m_Sprite: {fileID: 21300000, guid: 5ff0e472e77d92047aaf4e4de3f60eb6, type: 3}
  m_Type: 0
  m_PreserveAspect: 0
  m_FillCenter: 1
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForShop.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c2b451633a3769042be3e29875748a4a
+guid: 09cd70864cfb8ec4f83b6305f100454f
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab
@ -0,0 +1,173 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5497472336870809299
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3764179499350328605}
+  - component: {fileID: 3624012971965434372}
+  - component: {fileID: 280194952009065439}
+  - component: {fileID: 7808846309543892925}
+  m_Layer: 5
+  m_Name: Tip
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3764179499350328605
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5497472336870809299}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 3063730107973493407}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3624012971965434372
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5497472336870809299}
+  m_CullTransparentMesh: 1
+--- !u!114 &280194952009065439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5497472336870809299}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &7808846309543892925
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5497472336870809299}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3ec528580423c754aa901f44d3231b5c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  text: {fileID: 2323097163249105677}
+  fadeSpeed: 1
+  startFadeTime: 1
+--- !u!1 &7610608083571596301
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3063730107973493407}
+  - component: {fileID: 2167812618046495212}
+  - component: {fileID: 2323097163249105677}
+  m_Layer: 5
+  m_Name: Text (Legacy)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3063730107973493407
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7610608083571596301}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3764179499350328605}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2167812618046495212
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7610608083571596301}
+  m_CullTransparentMesh: 1
+--- !u!114 &2323097163249105677
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7610608083571596301}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: 846d2bc064c8faa4a858510d85bd7140, type: 3}
+    m_FontSize: 80
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 1
+    m_MaxSize: 100
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: 1
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/TipsPrefab/Tip.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e0a60d1ef5f1bbf40b92eefa1fee8d16
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
@ -13176,6 +13176,106 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 704929075}
  m_CullTransparentMesh: 1
+--- !u!1 &709798418
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 709798419}
+  - component: {fileID: 709798422}
+  - component: {fileID: 709798421}
+  - component: {fileID: 709798420}
+  m_Layer: 5
+  m_Name: TipFather
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &709798419
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 709798418}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 789990414}
+  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: -4.3796, y: 500}
+  m_SizeDelta: {x: 540.0161, y: 373.4404}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &709798420
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 709798418}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 7
+  m_StartCorner: 2
+  m_StartAxis: 1
+  m_CellSize: {x: 500, y: 100}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 1
+  m_ConstraintCount: 1
+--- !u!114 &709798421
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 709798418}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &709798422
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 709798418}
+  m_CullTransparentMesh: 1
 --- !u!1 &725512355
 GameObject:
  m_ObjectHideFlags: 0
@ -14126,6 +14226,121 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &789990413
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 789990414}
+  - component: {fileID: 789990417}
+  - component: {fileID: 789990416}
+  - component: {fileID: 789990415}
+  - component: {fileID: 789990418}
+  m_Layer: 5
+  m_Name: TipsCanves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &789990414
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 789990413}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 709798419}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!114 &789990415
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 789990413}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &789990416
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 789990413}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 0
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 800, y: 600}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &789990417
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 789990413}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!114 &789990418
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 789990413}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37a25d73d3b60b74b9a1135e0228a764, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &791443577
 GameObject:
  m_ObjectHideFlags: 0
@ -18803,11 +19018,11 @@ MonoBehaviour:
  potionTipIcon: {fileID: 21300000, guid: 0f0274fed944193419950861f0f57273, type: 3}
  rewardsList: []
  cardRewardList: []
-  cardPrefabCommon: {fileID: 4169693119190854323, guid: c0b7ece12d08c994c8148e8c99779e95,
+  cardPrefabCommon: {fileID: 4169693119190854323, guid: bde7b0a7c5fcf7145b84c1f52cb5dabc,
    type: 3}
-  cardPrefabLegendary: {fileID: 4169693119190854323, guid: c0b7ece12d08c994c8148e8c99779e95,
+  cardPrefabLegendary: {fileID: 4169693119190854323, guid: bde7b0a7c5fcf7145b84c1f52cb5dabc,
    type: 3}
-  cardPrefabRare: {fileID: 4169693119190854323, guid: c0b7ece12d08c994c8148e8c99779e95,
+  cardPrefabRare: {fileID: 4169693119190854323, guid: bde7b0a7c5fcf7145b84c1f52cb5dabc,
    type: 3}
  cardChoosePanleFather: {fileID: 125896954}
  cardChoosePanlePrefab: {fileID: 589092828266680353, guid: eb223c06382861e4486db9aa6bb52050,
@ -29611,11 +29826,11 @@ MonoBehaviour:
  cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2}
  relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2}
  colorSortList: 010000000300000004000000
-  commonCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb,
+  commonCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
    type: 3}
-  legendaryCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb,
+  legendaryCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
    type: 3}
-  rareCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb,
+  rareCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
    type: 3}
 --- !u!4 &1690695890
 Transform:
@ -30721,7 +30936,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1750187012
 RectTransform:
  m_ObjectHideFlags: 0
@ -30806,6 +31021,53 @@ Canvas:
  m_SortingLayerID: 801241541
  m_SortingOrder: 2
  m_TargetDisplay: 0
+--- !u!1 &1751203282
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1751203284}
+  - component: {fileID: 1751203283}
+  m_Layer: 0
+  m_Name: TipManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1751203283
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1751203282}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee87c15a64f613844a87d107810032fd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tipFather: {fileID: 709798419}
+  tipContainer: {fileID: 5497472336870809299, guid: e0a60d1ef5f1bbf40b92eefa1fee8d16,
+    type: 3}
+--- !u!4 &1751203284
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1751203282}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.84116334, y: 2.8039339, z: -1.2433522}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1755253523
 GameObject:
  m_ObjectHideFlags: 0
@ -39765,3 +40027,5 @@ SceneRoots:
  - {fileID: 992566371}
  - {fileID: 395072433}
  - {fileID: 2068068679}
+  - {fileID: 789990414}
+  - {fileID: 1751203284}
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/Shop.unity
@ -4848,7 +4848,7 @@ MonoBehaviour:
    m_Top: 7
    m_Bottom: 0
  m_ChildAlignment: 0
-  m_StartCorner: 0
+  m_StartCorner: 1
  m_StartAxis: 0
  m_CellSize: {x: 125, y: 200}
  m_Spacing: {x: 25, y: 100}
@ -5903,7 +5903,7 @@ MonoBehaviour:
    m_Top: 23
    m_Bottom: 0
  m_ChildAlignment: 0
-  m_StartCorner: 0
+  m_StartCorner: 1
  m_StartAxis: 0
  m_CellSize: {x: 124.64, y: 200}
  m_Spacing: {x: 25, y: 100}
@ -19437,8 +19437,8 @@ RectTransform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 378950670}
  - {fileID: 498734651}
+  - {fileID: 378950670}
  - {fileID: 866545451}
  - {fileID: 2004000271}
  - {fileID: 1083918071}
@ -27663,6 +27663,8 @@ MonoBehaviour:
  fun1Image: {fileID: 1339408805429835354}
  fun2Image: {fileID: 5226070091664710168}
  fun3Image: {fileID: 4924132909977853743}
+  successCondition: {fileID: 0}
+  unsuccessCondition: {fileID: 0}
  fun1Val: {fileID: 5204618098417416137}
  fun2Val: {fileID: 534906922457473645}
  fun3Val: {fileID: 8606927767695806529}
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity
@ -277,6 +277,168 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 52975079}
  m_CullTransparentMesh: 1
+--- !u!1 &61966376
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 61966381}
+  - component: {fileID: 61966380}
+  - component: {fileID: 61966379}
+  - component: {fileID: 61966378}
+  - component: {fileID: 61966377}
+  m_Layer: 5
+  m_Name: TipsCanves
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &61966377
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 61966376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 37a25d73d3b60b74b9a1135e0228a764, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!114 &61966378
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 61966376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
+--- !u!114 &61966379
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 61966376}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_UiScaleMode: 1
+  m_ReferencePixelsPerUnit: 100
+  m_ScaleFactor: 1
+  m_ReferenceResolution: {x: 1920, y: 1080}
+  m_ScreenMatchMode: 0
+  m_MatchWidthOrHeight: 0.5
+  m_PhysicalUnit: 3
+  m_FallbackScreenDPI: 96
+  m_DefaultSpriteDPI: 96
+  m_DynamicPixelsPerUnit: 1
+  m_PresetInfoIsWorld: 0
+--- !u!223 &61966380
+Canvas:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 61966376}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_RenderMode: 0
+  m_Camera: {fileID: 0}
+  m_PlaneDistance: 100
+  m_PixelPerfect: 0
+  m_ReceivesEvents: 1
+  m_OverrideSorting: 0
+  m_OverridePixelPerfect: 0
+  m_SortingBucketNormalizedSize: 0
+  m_VertexColorAlwaysGammaSpace: 0
+  m_AdditionalShaderChannelsFlag: 0
+  m_UpdateRectTransformForStandalone: 0
+  m_SortingLayerID: 0
+  m_SortingOrder: 0
+  m_TargetDisplay: 0
+--- !u!224 &61966381
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 61966376}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 985714519}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 0}
+--- !u!1 &146625438
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 146625440}
+  - component: {fileID: 146625439}
+  m_Layer: 0
+  m_Name: TipManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &146625439
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 146625438}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: ee87c15a64f613844a87d107810032fd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tipFather: {fileID: 985714519}
+  tipContainer: {fileID: 5497472336870809299, guid: e0a60d1ef5f1bbf40b92eefa1fee8d16,
+    type: 3}
+--- !u!4 &146625440
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 146625438}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.84116334, y: 2.8039339, z: -1.2433522}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &148855150
 GameObject:
  m_ObjectHideFlags: 0
@ -889,11 +1051,11 @@ MonoBehaviour:
  cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2}
  relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2}
  colorSortList: 
-  commonCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb,
+  commonCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
    type: 3}
-  legendaryCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb,
+  legendaryCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
    type: 3}
-  rareCardForLook: {fileID: 4169693119190854323, guid: 6b012c33b9abd7b4ab44b2b165c9ccdb,
+  rareCardForLook: {fileID: 4169693119190854323, guid: d349e9c2ce0a808418c6eed487637259,
    type: 3}
 --- !u!4 &485170433
 Transform:
@ -1219,6 +1381,69 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 761789730}
  m_CullTransparentMesh: 1
+--- !u!1 &773472459
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 773472461}
+  - component: {fileID: 773472460}
+  m_Layer: 0
+  m_Name: CardResourcesManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &773472460
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 773472459}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 813097672e0cbe3448085cac4e3c47da, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  redNodeImage: {fileID: 21300000, guid: 981748b12f9371548b9c69073d83825d, type: 3}
+  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}
+  attack: {fileID: 2089713304, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  shield: {fileID: 298242201, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  step: {fileID: -1638093221, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  weak: {fileID: 1313707503, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  wet: {fileID: 807148770, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  costRestore: {fileID: 587810021, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  drawCard: {fileID: 162605382, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  posion: {fileID: -1661284519, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  vulnerable: {fileID: 30630105, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  fireSeed: {fileID: 562257326, guid: 79ebf0a4b1114a945b133aa5fcf5e011, type: 3}
+  imageInCondition: {fileID: 2948337350984551391, guid: f4c36c2c021e0954897974b7ad041903,
+    type: 3}
+  textInCondition: {fileID: 2195466461428280820, guid: ef66a5db78741da4d93f90fcdcb7176a,
+    type: 3}
+--- !u!4 &773472461
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 773472459}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &774346661
 GameObject:
  m_ObjectHideFlags: 0
@ -1400,6 +1625,106 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
+--- !u!1 &985714518
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 985714519}
+  - component: {fileID: 985714522}
+  - component: {fileID: 985714521}
+  - component: {fileID: 985714520}
+  m_Layer: 5
+  m_Name: TipFather
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &985714519
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 985714518}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 61966381}
+  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: -4.3796, y: 500}
+  m_SizeDelta: {x: 540.0161, y: 373.4404}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &985714520
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 985714518}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 7
+  m_StartCorner: 2
+  m_StartAxis: 1
+  m_CellSize: {x: 500, y: 100}
+  m_Spacing: {x: 0, y: 0}
+  m_Constraint: 1
+  m_ConstraintCount: 1
+--- !u!114 &985714521
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 985714518}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!222 &985714522
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 985714518}
+  m_CullTransparentMesh: 1
 --- !u!1 &1080464288
 GameObject:
  m_ObjectHideFlags: 0
@ -1882,63 +2207,6 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1322208515
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1322208517}
-  - component: {fileID: 1322208516}
-  m_Layer: 0
-  m_Name: CardResourcesManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1322208516
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1322208515}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 813097672e0cbe3448085cac4e3c47da, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  redNodeImage: {fileID: 21300000, guid: 981748b12f9371548b9c69073d83825d, type: 3}
-  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}
-  attack: {fileID: 21300000, guid: 3bddb1e29933c8c4eac9f2f054ad43d1, type: 3}
-  shield: {fileID: 21300000, guid: f570dfeb705959d4d9551aadbb8817d4, type: 3}
-  step: {fileID: 21300000, guid: 5312c2d969ace5843abc2c7201679b9d, type: 3}
-  weak: {fileID: 262922594, guid: f9991f9de5deef7488a05908175569c3, type: 3}
-  imageInCondition: {fileID: 2948337350984551391, guid: f4c36c2c021e0954897974b7ad041903,
-    type: 3}
-  textInCondition: {fileID: 2195466461428280820, guid: ef66a5db78741da4d93f90fcdcb7176a,
-    type: 3}
--- !u!4 &1322208517
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1322208515}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1571871170
 GameObject:
  m_ObjectHideFlags: 0
@ -3146,4 +3414,6 @@ SceneRoots:
  - {fileID: 1571871172}
  - {fileID: 1224874803}
  - {fileID: 1612287987}
-  - {fileID: 1322208517}
+  - {fileID: 773472461}
+  - {fileID: 146625440}
+  - {fileID: 61966381}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
@ -261,6 +261,7 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
        if (GameManager.Instance.playerState.currentCost - trueCost < 0)
        {
            Debug.Log("费用不足");
+            TipManager.Instance.SendTip("费用不足");
            cardEntity.canUse = false;
        }

--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/InFightLookCardManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/LookCard/InFightLookCardManager.cs
@ -25,7 +25,7 @@ public class InFightLookCardManager : MonoBehaviour

        for (int i = 0; i < cardList.Count; i++)
        {
-            var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
+            var currentCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardList[i], transform);
            currentCard.transform.localScale = cardScale;
            cardGameObjectList.Add(currentCard);
        }
@ -48,7 +48,7 @@ public class InFightLookCardManager : MonoBehaviour

        for (int i = 0; i < cardList.Count; i++)
        {
-            var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
+            var currentCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardList[i], transform);
            currentCard.transform.localScale = cardScale;
            cardGameObjectList.Add(currentCard);
        }
@ -71,7 +71,7 @@ public class InFightLookCardManager : MonoBehaviour

        for (int i = 0; i < cardList.Count; i++)
        {
-            var currentCard = TurnMaster.Instance.CreateCardWithIDForLook(cardList[i], transform);
+            var currentCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardList[i], transform);
            currentCard.transform.localScale = cardScale;
            cardGameObjectList.Add(currentCard);
        }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
@ -126,6 +126,7 @@ public class TurnMaster : Singleton<TurnMaster>

        if (turn == Turn.enemyTurnBegin)
        {
+            
            //广播遗物接口
            LegacyManager.Instance.BroadCastSettleInEnemyTurnBegin();

@ -137,7 +138,7 @@ public class TurnMaster : Singleton<TurnMaster>
        {
            //等待准备阶段效果结算完毕开始回合
            //StartCoroutine(EnemyTurn());
-
+            
            //敌人动作如移动，涂色   
            EnemyManager.Instance.EnemyTurn_Observer();  
            
@ -167,14 +168,20 @@ public class TurnMaster : Singleton<TurnMaster>
    IEnumerator EndPlayerTurnBegin()
    {
        turn = Turn.turnStop;
+        TipManager.Instance.SendTip("玩家回合！");
        yield return new WaitForSeconds(3.0f); // 等待3秒
+
+        
        turn = Turn.playerTurn;
    }
    IEnumerator WaitEndPlayerTurn()
    {
        turn = Turn.turnStop;
        yield return new WaitUntil(()=>continueTurn ==true );
-        yield return new WaitForSeconds(0.5f);
+        //提示
+        TipManager.Instance.SendTip("敌人回合！");
+
+        yield return new WaitForSeconds(2.5f);
        turn = Turn.enemyTurnBegin;
    }
    public void EndPlayerTurn()
@ -442,29 +449,30 @@ public class TurnMaster : Singleton<TurnMaster>
    public void createCardWithoutMove(int i)
    {
        GameObject cardPrefab;
-        int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[cardDeck.cardList[cardDeck.cardList.Count - 1]].Rarity;
-        cardPrefab = new GameObject();
-        switch (cardRarity)
-        {
-            case Name.CardRarity.Legendary:
-                cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform);
-                break;
-            case Name.CardRarity.Rare:
-                cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform);
-                break;
-            case Name.CardRarity.Common:
-                cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform);
-                break;
-        }
-/*        if (cardRarity == Name.CardRarity.Legendary)
-        {
-            cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform);
-        }
-        else
-        {
-            cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform);
-        }*/
-
+        cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform);
+        /* int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[cardDeck.cardList[cardDeck.cardList.Count - 1]].Rarity;
+         cardPrefab = new GameObject();
+         switch (cardRarity)
+         {
+             case Name.CardRarity.Legendary:
+                 cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform);
+                 break;
+             case Name.CardRarity.Rare:
+                 cardPrefab = Instantiate(cardDeck.rareCardPrefab, handCard.cardPanle.transform);
+                 break;
+             case Name.CardRarity.Common:
+                 cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform);
+                 break;
+         }
+        if (cardRarity == Name.CardRarity.Legendary)
+         {
+             cardPrefab = Instantiate(cardDeck.legendaryCardPrefab, handCard.cardPanle.transform);
+         }
+         else
+         {
+             cardPrefab = Instantiate(cardDeck.cardPrefabPuTong, handCard.cardPanle.transform);
+         }
+        */
        cardPrefab.GetComponent<RectTransform>().localEulerAngles = new Vector3(0, 0, 0);
        CardEntity cardEntity = cardPrefab.GetComponent<CardEntity>();
        cardEntity.createCard(cardDeck.cardList[cardDeck.cardList.Count - 1], i,true);
@ -472,28 +480,4 @@ public class TurnMaster : Singleton<TurnMaster>
        handCard.cardEntityList.Add(cardEntity);
    }

-
-    public GameObject CreateCardWithIDForLook(string id,Transform cardFrather)
-    {
-        GameObject cardPrefab;
-        cardPrefab = new GameObject();
-        int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[id].Rarity;   
-        switch (cardRarity)
-        {
-            case Name.CardRarity.Legendary:
-                cardPrefab = Instantiate(PlayerStatsManager .Instance.legendaryCardForLook, cardFrather);
-                break;
-            case Name.CardRarity.Rare:
-                cardPrefab = Instantiate(PlayerStatsManager.Instance.rareCardForLook, cardFrather);
-                break;
-            case Name.CardRarity.Common:
-                cardPrefab = Instantiate(PlayerStatsManager.Instance.commonCardForLook, cardFrather);
-                break;
-        }
-        cardPrefab.GetComponent<RectTransform>().localEulerAngles = new Vector3(0, 0, 0);
-        CardEntity cardEntity = cardPrefab.GetComponent<CardEntity>();
-        cardEntity.createCard(id, 0,false);
-
-        return cardPrefab;
-    }
 }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs
@ -126,20 +126,7 @@ public class RewardManager : Singleton<RewardManager>
    public GameObject CreateCardWithIDForReward(string id, Transform cardFrather)
    {
        GameObject cardPrefab;
-        cardPrefab = new GameObject();
-        int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[id].Rarity;
-        switch (cardRarity)
-        {
-            case Name.CardRarity.Legendary:
-                cardPrefab = Instantiate(cardPrefabLegendary, cardFrather);
-                break;
-            case Name.CardRarity.Rare:
-                cardPrefab = Instantiate(cardPrefabRare, cardFrather);
-                break;
-            case Name.CardRarity.Common:
-                cardPrefab = Instantiate(cardPrefabCommon, cardFrather);
-                break;
-        }
+        cardPrefab = Instantiate(cardPrefabCommon, cardFrather);
        cardPrefab.GetComponent<RectTransform>().localEulerAngles = new Vector3(0, 0, 0);
        CardEntity cardEntity = cardPrefab.GetComponent<CardEntity>();
        cardEntity.createCard(id, 0,false);
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_DamagedBag.cs
@ -6,7 +6,7 @@ public class LegacyNode_DamagedBag : LegacyNode
 {
    public override void OnGet()
    {
-        GameManager.Instance.playerState.cardRewardNumToChoose -= 2;
-        GameManager.Instance.playerState.maxCost ++;
+       PlayerStatsManager .Instance.playerState.cardRewardNumToChoose -= 2;
+       PlayerStatsManager .Instance.playerState.maxCost ++;
    }
 }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_StrongBody.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyChild/LegacyNode_StrongBody.cs
@ -6,9 +6,9 @@ public class LegacyNode_StrongBody : LegacyNode
 {
    public override void OnGet()
    {
-        int upHp = (int)(GameManager.Instance.playerState.maxHP * 0.2f);
-        GameManager.Instance.playerState.maxHP += upHp;
-        GameManager.Instance.playerState.currentHP += upHp;
+        int upHp = (int)(PlayerStatsManager .Instance.playerState.maxHP * 0.2f);
+        PlayerStatsManager .Instance.playerState.maxHP += upHp;
+        PlayerStatsManager.Instance.playerState.currentHP += upHp;
    }

 }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs
@ -46,6 +46,7 @@ public class LegacyManager : Singleton <LegacyManager>
        method.Invoke(legacyClass, parameters );

        relicClassNameList.Add(className);
+        
    }
    public void ShowLegacyClassAsOwned()
    {
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/PlayerManager/PlayerStatsManager.cs
@ -98,20 +98,7 @@ public class PlayerStatsManager : Singleton <PlayerStatsManager>
    public GameObject CreateCardWithIDForLook(string id, Transform cardFrather)
    {
        GameObject cardPrefab;
-        cardPrefab = new GameObject();
-        int cardRarity = CardOriginalDataList.Instance.cardOriginalDataList[id].Rarity;
-        switch (cardRarity)
-        {
-            case Name.CardRarity.Legendary:
-                cardPrefab = Instantiate(PlayerStatsManager.Instance.legendaryCardForLook, cardFrather);
-                break;
-            case Name.CardRarity.Rare:
-                cardPrefab = Instantiate(PlayerStatsManager.Instance.rareCardForLook, cardFrather);
-                break;
-            case Name.CardRarity.Common:
-                cardPrefab = Instantiate(PlayerStatsManager.Instance.commonCardForLook, cardFrather);
-                break;
-        }
+        cardPrefab = Instantiate(commonCardForLook, cardFrather); 
        cardPrefab.GetComponent<RectTransform>().localEulerAngles = new Vector3(0, 0, 0);
        CardEntity cardEntity = cardPrefab.GetComponent<CardEntity>();
        cardEntity.createCard(id, 0, false);
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/CardSaleNode.cs
@ -1,9 +1,11 @@
 using System.Collections;
 using System.Collections.Generic;
+using Unity.VisualScripting;
 using UnityEngine;
+using UnityEngine.EventSystems;
 using UnityEngine.UI;

-public class CardSaleNode : MonoBehaviour
+public class CardSaleNode : MonoBehaviour,IPointerEnterHandler ,IPointerExitHandler 
 {
    public int price=100;
    public Text priceText;
@ -16,9 +18,29 @@ public class CardSaleNode : MonoBehaviour
            ShopManager.Instance.cardDeck.Add(cardID);
            ShopManager.Instance.playerState.money -= price;
            saledMark.SetActive(true);
+            transform .GetChild (0).gameObject .SetActive(false);
+            transform.localScale = new Vector3(1, 1, 1);
+            TipManager.Instance.SendTip("¹ºÂò³É¹¦");
+        }
+        else
+        {
+            TipManager.Instance.SendTip("½ð±Ò²»×ã");
        }
-        
        //ÉùÒô
        AudioManager.Instance.BuyVoicePlayer();
    }
+    public void OnPointerEnter(PointerEventData eventData)
+    {
+        if(saledMark.activeInHierarchy ==false )
+        transform.localScale = new Vector3(1.4f, 1.4f, 1.4f);
+    }
+    public void OnPointerExit(PointerEventData eventData)
+    {
+        transform.localScale = new Vector3(1, 1, 1);
+        
+    }
+
+   
+
+   
 }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/RelicSaleNode.cs
@ -13,9 +13,14 @@ public class RelicSaleNode : MonoBehaviour
    {
        if (ShopManager.Instance.playerState.money >= price)
        {
-           
+            LegacyManager.Instance.CreateLegacyClassAsNew(relicName);
            ShopManager.Instance.playerState.money -= price;
            saledMark.SetActive(true);
+            TipManager.Instance.SendTip("购买成功");
+        }
+        else 
+        {
+            TipManager.Instance.SendTip("金币不足");
        }

        //ÉùÒô
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs
@ -120,7 +120,7 @@ public class ShopManager : Singleton <ShopManager>
    {
        for(int i=0;i< 3;i++)
        {
-            int cardId = (int)Random.Range(1001, 1004);
+            int cardId = (int)Random.Range(1010, 1037);
            var currentSaleCardNode = Instantiate(saleCardNode, cardFather1);
            var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardId.ToString(), currentSaleCardNode.transform);
            card.transform.localPosition = new Vector3(0, 0, 0);
@ -129,7 +129,7 @@ public class ShopManager : Singleton <ShopManager>
        }
        for (int i = 0; i < 3; i++)
        {
-            int cardId = (int)Random.Range(1001, 1004);
+            int cardId = (int)Random.Range(1010, 1037);
            var currentSaleCardNode = Instantiate(saleCardNode, cardFather2);
            var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardId.ToString(), currentSaleCardNode.transform);
            card.transform.localPosition = new Vector3(0, 0, 0);
@ -137,7 +137,7 @@ public class ShopManager : Singleton <ShopManager>
            currentSaleCardNode.GetComponent<CardSaleNode>().cardID = cardId.ToString();
        }
        //µ¥¶À¹ºÂòµÄÎÞÉ«¿¨
-        int noneColorCardId = (int)Random.Range(1001, 1004);
+        int noneColorCardId = (int)Random.Range(1010, 1037);
        var noneColorCardNode = Instantiate(saleCardNode, cardNoneColorFather);
        var noneColorCard = PlayerStatsManager.Instance.CreateCardWithIDForLook(noneColorCardId.ToString(), noneColorCardNode.transform);
        noneColorCard.transform.localPosition = new Vector3(0, 0, 0);
@ -164,6 +164,7 @@ public class ShopManager : Singleton <ShopManager>
        {
           var relic =  LegacyManager.Instance.ShowRelicAsSale(relicSaleNodePrefab, relicClassName[i],relicSaleFather);
            RelicSaleNode relicSaleNode = relic.GetComponent<RelicSaleNode>();
+            relicSaleNode .relicName = relicClassName[i];
            relicSaleNodesList.Add(relicSaleNode);
        }
    }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 998e51a8d6db3f746bf58d173eea1edb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs
@ -0,0 +1,32 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class TipManager : Singleton<TipManager>
+{
+    [Header("ÌáÊ¾¸¸¼¶")]
+    public Transform tipFather;
+    [Header("ÌáÊ¾Ô¤ÖÆÌå")]
+    public GameObject tipContainer;
+
+    private void Start()
+    {
+        DontDestroyOnLoad(this.gameObject);
+    }
+
+    public void SendTip(string message)
+    {
+        var tip = Instantiate(tipContainer, tipFather.transform);
+        tip.transform.SetAsFirstSibling();
+        TipNode tipNode = tip.GetComponent<TipNode>();
+        tipNode.SetMessage(message);
+    }
+    public void SendTip(string message ,Vector3 scale)
+    {
+        var tip = Instantiate(tipContainer, tipFather.transform);
+        tip.transform.SetAsFirstSibling();
+        tip.transform.localScale = scale;
+        TipNode tipNode = tip.GetComponent<TipNode>();
+        tipNode.SetMessage(message);
+    }
+}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipManager.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ee87c15a64f613844a87d107810032fd
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs
@ -0,0 +1,34 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class TipNode : MonoBehaviour
+{
+    public Text text;
+    public float fadeSpeed=2;
+    public float startFadeTime=2;
+    private void Start()
+    {
+        StartCoroutine(TipFade());
+    }
+    IEnumerator TipFade()
+    {
+        yield return new WaitForSeconds(startFadeTime);
+        while (true )
+        {
+            text.color -= new Color(0, 0, 0,Time.deltaTime * fadeSpeed);
+            if (text.color.a <= 0)
+            {
+                Destroy(this.gameObject);
+                yield break;
+            }
+            yield return null;
+        }
+        
+    }
+    public void SetMessage(string message)
+    {
+        text.text = message;
+    }
+}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tips/TipNode.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3ec528580423c754aa901f44d3231b5c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs
@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DontDestoryGameObject : MonoBehaviour
+{
+    private void Start()
+    {
+        DontDestroyOnLoad(this.gameObject);
+    }
+}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/DontDestoryGameObject.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 37a25d73d3b60b74b9a1135e0228a764
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: