开始加成点

12 months ago · c9074dde01
27 changed files with 393437 additions and 933 deletions
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset
@ -12,15 +12,15 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 23280c7f867c4ca468ab73909d4f7707, type: 3}
  m_Name: LevelState_1
  m_EditorClassIdentifier: 
-  levelStep: 1
+  levelStep: 2
-  mapLevel: 1
+  mapLevel: 2
-  currentPoint: {x: 6, y: 1}
+  currentPoint: {x: 1, y: 1}
  levelSaveMap:
  - levelDataList:
    - roomType: 13
      isUse: 0
      passBy: 0
-      nodePos: {x: -6.980713, y: 0.05970478, z: -7.669101}
+      nodePos: {x: -9.480713, y: 0.05970478, z: -7.669101}
      line: 0
      column: 0
      fatherLevelNodes: []
@ -33,8 +33,8 @@ MonoBehaviour:
      isExtra: 0
    - roomType: 13
      isUse: 1
-      passBy: 1
+      passBy: 0
-      nodePos: {x: -6.9807186, y: 0.059706688, z: -6.669104}
+      nodePos: {x: -9.4807205, y: 0.059706688, z: -6.669104}
      line: 0
      column: 1
      fatherLevelNodes: []
@ -49,7 +49,7 @@ MonoBehaviour:
    - roomType: 13
      isUse: 0
      passBy: 0
-      nodePos: {x: -6.9807262, y: 0.059708595, z: -5.669105}
+      nodePos: {x: -9.480728, y: 0.059708595, z: -5.669105}
      line: 0
      column: 2
      fatherLevelNodes: []
@ -64,7 +64,7 @@ MonoBehaviour:
    - roomType: 0
      isUse: 0
      passBy: 0
-      nodePos: {x: -4.980734, y: 0.05971241, z: -7.669103}
+      nodePos: {x: -7.4807434, y: 0.05971241, z: -7.669103}
      line: 1
      column: 0
      fatherLevelNodes: []
@ -73,14 +73,15 @@ MonoBehaviour:
      enemyList:
      - 4007
      - 4008
      - 4008
      extraEnemyList: []
      mapIndex: 100001
      extraMapIndex: 
      isExtra: 0
    - roomType: 0
      isUse: 1
-      passBy: 1
+      passBy: 0
-      nodePos: {x: -4.980736, y: 0.059714317, z: -6.669105}
+      nodePos: {x: -7.480749, y: 0.059714317, z: -6.669105}
      line: 1
      column: 1
      fatherLevelNodes:
@ -93,7 +94,6 @@ MonoBehaviour:
      enemyList:
      - 4007
      - 4008
      - 4008
      extraEnemyList: []
      mapIndex: 100001
      extraMapIndex: 
@ -101,25 +101,25 @@ MonoBehaviour:
    - roomType: 0
      isUse: 0
      passBy: 0
-      nodePos: {x: -4.9807396, y: 0.059716225, z: -5.669106}
+      nodePos: {x: -7.4807568, y: 0.059716225, z: -5.669106}
      line: 1
      column: 2
      fatherLevelNodes: []
      nextLevelNodes: []
      fightEenemyPool: weak
      enemyList:
-      - 4007
+      - 4003
-      - 4008
+      - 4003
-      - 4008
+      - 4004
      extraEnemyList: []
      mapIndex: 100001
      extraMapIndex: 
      isExtra: 0
  - levelDataList:
-    - roomType: 10
+    - roomType: 11
      isUse: 1
      passBy: 0
-      nodePos: {x: -2.9807506, y: 0.05972004, z: -7.669102}
+      nodePos: {x: -5.4807644, y: 0.05972004, z: -7.669102}
      line: 2
      column: 0
      fatherLevelNodes:
@ -132,10 +132,10 @@ MonoBehaviour:
      mapIndex: 
      extraMapIndex: 
      isExtra: 0
-    - roomType: 12
+    - roomType: 9
      isUse: 1
-      passBy: 1
+      passBy: 0
-      nodePos: {x: -2.9807534, y: 0.059721947, z: -6.669105}
+      nodePos: {x: -5.480768, y: 0.059721947, z: -6.669105}
      line: 2
      column: 1
      fatherLevelNodes:
@ -148,10 +148,10 @@ MonoBehaviour:
      mapIndex: 
      extraMapIndex: 
      isExtra: 0
-    - roomType: 11
+    - roomType: 4
      isUse: 1
      passBy: 0
-      nodePos: {x: -2.980761, y: 0.059723854, z: -5.669108}
+      nodePos: {x: -5.48077, y: 0.059723854, z: -5.669108}
      line: 2
      column: 2
      fatherLevelNodes:
@ -168,7 +168,7 @@ MonoBehaviour:
    - roomType: 0
      isUse: 1
      passBy: 0
-      nodePos: {x: -0.98076725, y: 0.05972767, z: -7.669103}
+      nodePos: {x: -3.4807796, y: 0.05972767, z: -7.669103}
      line: 3
      column: 0
      fatherLevelNodes: []
@ -176,17 +176,16 @@ MonoBehaviour:
      - {x: 4, y: 0}
      fightEenemyPool: weak
      enemyList:
-      - 4003
+      - 4007
-      - 4003
+      - 4008
      - 4004
      extraEnemyList: []
      mapIndex: 100001
      extraMapIndex: 
      isExtra: 0
    - roomType: 0
      isUse: 1
-      passBy: 1
+      passBy: 0
-      nodePos: {x: -0.9807706, y: 0.059729576, z: -6.669105}
+      nodePos: {x: -3.4807835, y: 0.059729576, z: -6.669105}
      line: 3
      column: 1
      fatherLevelNodes: []
@ -204,7 +203,7 @@ MonoBehaviour:
    - roomType: 0
      isUse: 1
      passBy: 0
-      nodePos: {x: -0.9807744, y: 0.059731483, z: -5.669107}
+      nodePos: {x: -3.4807873, y: 0.059731483, z: -5.669107}
      line: 3
      column: 2
      fatherLevelNodes: []
@ -220,10 +219,10 @@ MonoBehaviour:
      extraMapIndex: 
      isExtra: 0
  - levelDataList:
-    - roomType: 4
+    - roomType: 12
      isUse: 1
      passBy: 0
-      nodePos: {x: 1.0192237, y: 0.0597353, z: -7.669103}
+      nodePos: {x: -1.4807968, y: 0.0597353, z: -7.669103}
      line: 4
      column: 0
      fatherLevelNodes:
@ -236,10 +235,10 @@ MonoBehaviour:
      mapIndex: 
      extraMapIndex: 
      isExtra: 0
-    - roomType: 8
+    - roomType: 10
      isUse: 1
-      passBy: 1
+      passBy: 0
-      nodePos: {x: 1.0192223, y: 0.059737206, z: -6.669104}
+      nodePos: {x: -1.4808006, y: 0.059737206, z: -6.669104}
      line: 4
      column: 1
      fatherLevelNodes:
@ -252,10 +251,10 @@ MonoBehaviour:
      mapIndex: 
      extraMapIndex: 
      isExtra: 0
-    - roomType: 8
+    - roomType: 12
      isUse: 1
      passBy: 0
-      nodePos: {x: 1.0192199, y: 0.059739113, z: -5.669106}
+      nodePos: {x: -1.4808044, y: 0.059739113, z: -5.669106}
      line: 4
      column: 2
      fatherLevelNodes:
@ -272,7 +271,7 @@ MonoBehaviour:
    - roomType: 7
      isUse: 0
      passBy: 0
-      nodePos: {x: 3.019217, y: 0.059742928, z: -7.669101}
+      nodePos: {x: 0.51919365, y: 0.059742928, z: -7.669101}
      line: 5
      column: 0
      fatherLevelNodes: []
@ -285,8 +284,8 @@ MonoBehaviour:
      isExtra: 0
    - roomType: 7
      isUse: 1
-      passBy: 1
+      passBy: 0
-      nodePos: {x: 3.019216, y: 0.059744835, z: -6.669104}
+      nodePos: {x: 0.51919127, y: 0.059744835, z: -6.669104}
      line: 5
      column: 1
      fatherLevelNodes:
@ -304,7 +303,7 @@ MonoBehaviour:
    - roomType: 7
      isUse: 0
      passBy: 0
-      nodePos: {x: 3.0192153, y: 0.059746742, z: -5.669105}
+      nodePos: {x: 0.51918983, y: 0.059746742, z: -5.669105}
      line: 5
      column: 2
      fatherLevelNodes: []
@ -319,7 +318,7 @@ MonoBehaviour:
    - roomType: 0
      isUse: 0
      passBy: 0
-      nodePos: {x: 5.019217, y: 0.059750557, z: -7.669101}
+      nodePos: {x: 2.5191882, y: 0.059750557, z: -7.669101}
      line: 6
      column: 0
      fatherLevelNodes: []
@ -332,10 +331,10 @@ MonoBehaviour:
      mapIndex: 100001
      extraMapIndex: 
      isExtra: 0
-    - roomType: 2
+    - roomType: 0
      isUse: 1
-      passBy: 1
+      passBy: 0
-      nodePos: {x: 5.019217, y: 0.059752464, z: -6.669105}
+      nodePos: {x: 2.5191865, y: 0.059752464, z: -6.669105}
      line: 6
      column: 1
      fatherLevelNodes:
@ -344,21 +343,18 @@ MonoBehaviour:
      - {x: 7, y: 1}
      - {x: 7, y: 0}
      - {x: 7, y: 2}
-      fightEenemyPool: eliteAndMonster
+      fightEenemyPool: strong
      enemyList:
-      - 4005
+      - 4017
-      - 4006
+      - 4018
-      extraEnemyList:
+      extraEnemyList: []
      - 4003
      - 4003
      - 4004
      mapIndex: 100001
-      extraMapIndex: 100001
+      extraMapIndex: 
-      isExtra: 1
+      isExtra: 0
    - roomType: 0
      isUse: 0
      passBy: 0
-      nodePos: {x: 5.019217, y: 0.05975437, z: -5.669106}
+      nodePos: {x: 2.519185, y: 0.05975437, z: -5.669106}
      line: 6
      column: 2
      fatherLevelNodes: []
@ -372,10 +368,10 @@ MonoBehaviour:
      extraMapIndex: 
      isExtra: 0
  - levelDataList:
-    - roomType: 9
+    - roomType: 8
      isUse: 1
      passBy: 0
-      nodePos: {x: 7.01922, y: 0.059758186, z: -7.669102}
+      nodePos: {x: 4.5191865, y: 0.059758186, z: -7.669102}
      line: 7
      column: 0
      fatherLevelNodes:
@ -391,7 +387,7 @@ MonoBehaviour:
    - roomType: 6
      isUse: 1
      passBy: 0
-      nodePos: {x: 7.0192204, y: 0.059760094, z: -6.669105}
+      nodePos: {x: 4.5191865, y: 0.059760094, z: -6.669105}
      line: 7
      column: 1
      fatherLevelNodes:
@ -404,10 +400,10 @@ MonoBehaviour:
      mapIndex: 
      extraMapIndex: 
      isExtra: 0
-    - roomType: 4
+    - roomType: 10
      isUse: 1
      passBy: 0
-      nodePos: {x: 7.0192213, y: 0.059762, z: -5.669108}
+      nodePos: {x: 4.5191865, y: 0.059762, z: -5.669108}
      line: 7
      column: 2
      fatherLevelNodes:
@ -424,7 +420,7 @@ MonoBehaviour:
    - roomType: 0
      isUse: 1
      passBy: 0
-      nodePos: {x: 9.019226, y: 0.059765816, z: -7.669103}
+      nodePos: {x: 6.5191884, y: 0.059765816, z: -7.669103}
      line: 8
      column: 0
      fatherLevelNodes: []
@ -438,19 +434,19 @@ MonoBehaviour:
      mapIndex: 100001
      extraMapIndex: 
      isExtra: 0
-    - roomType: 0
+    - roomType: 1
      isUse: 1
      passBy: 0
-      nodePos: {x: 9.019228, y: 0.059767723, z: -6.669105}
+      nodePos: {x: 6.5191894, y: 0.059767723, z: -6.669105}
      line: 8
      column: 1
      fatherLevelNodes: []
      nextLevelNodes:
      - {x: 9, y: 1}
-      fightEenemyPool: strong
+      fightEenemyPool: elite
      enemyList:
-      - 4017
+      - 4005
-      - 4018
+      - 4006
      extraEnemyList: []
      mapIndex: 100001
      extraMapIndex: 
@ -458,7 +454,7 @@ MonoBehaviour:
    - roomType: 0
      isUse: 1
      passBy: 0
-      nodePos: {x: 9.01923, y: 0.05976963, z: -5.669107}
+      nodePos: {x: 6.51919, y: 0.05976963, z: -5.669107}
      line: 8
      column: 2
      fatherLevelNodes: []
@ -473,10 +469,10 @@ MonoBehaviour:
      extraMapIndex: 
      isExtra: 0
  - levelDataList:
-    - roomType: 12
+    - roomType: 9
      isUse: 1
      passBy: 0
-      nodePos: {x: 11.019234, y: 0.059773445, z: -7.669103}
+      nodePos: {x: 8.519196, y: 0.059773445, z: -7.669103}
      line: 9
      column: 0
      fatherLevelNodes:
@ -489,10 +485,10 @@ MonoBehaviour:
      mapIndex: 
      extraMapIndex: 
      isExtra: 0
-    - roomType: 9
+    - roomType: 11
      isUse: 1
      passBy: 0
-      nodePos: {x: 11.019234, y: 0.059775352, z: -6.669104}
+      nodePos: {x: 8.519197, y: 0.059775352, z: -6.669104}
      line: 9
      column: 1
      fatherLevelNodes:
@ -505,10 +501,10 @@ MonoBehaviour:
      mapIndex: 
      extraMapIndex: 
      isExtra: 0
-    - roomType: 6
+    - roomType: 4
      isUse: 1
      passBy: 0
-      nodePos: {x: 11.0192375, y: 0.05977726, z: -5.669106}
+      nodePos: {x: 8.519199, y: 0.05977726, z: -5.669106}
      line: 9
      column: 2
      fatherLevelNodes:
@ -525,7 +521,7 @@ MonoBehaviour:
    - roomType: 0
      isUse: 0
      passBy: 0
-      nodePos: {x: 13.019245, y: 0.059781075, z: -7.669101}
+      nodePos: {x: 10.519204, y: 0.059781075, z: -7.669101}
      line: 10
      column: 0
      fatherLevelNodes: []
@ -538,10 +534,10 @@ MonoBehaviour:
      mapIndex: 100001
      extraMapIndex: 
      isExtra: 0
-    - roomType: 0
+    - roomType: 2
      isUse: 1
      passBy: 0
-      nodePos: {x: 13.01925, y: 0.059782982, z: -6.669105}
+      nodePos: {x: 10.519204, y: 0.059782982, z: -6.669105}
      line: 10
      column: 1
      fatherLevelNodes:
@ -550,37 +546,37 @@ MonoBehaviour:
      - {x: 9, y: 2}
      nextLevelNodes:
      - {x: 11, y: 1}
-      fightEenemyPool: strong
+      fightEenemyPool: eliteAndMonster
      enemyList:
-      - 4017
+      - 4005
-      - 4018
+      - 4006
-      extraEnemyList: []
+      extraEnemyList:
      - 4007
      - 4008
      mapIndex: 100001
-      extraMapIndex: 
+      extraMapIndex: 100001
      isExtra: 0
-    - roomType: 2
+    - roomType: 0
      isUse: 0
      passBy: 0
-      nodePos: {x: 13.019253, y: 0.05978489, z: -5.669107}
+      nodePos: {x: 10.519207, y: 0.05978489, z: -5.669107}
      line: 10
      column: 2
      fatherLevelNodes: []
      nextLevelNodes: []
-      fightEenemyPool: eliteAndMonster
+      fightEenemyPool: strong
      enemyList:
-      - 4005
+      - 4017
-      - 4006
+      - 4018
-      extraEnemyList:
+      extraEnemyList: []
      - 4007
      - 4008
      mapIndex: 100001
-      extraMapIndex: 100001
+      extraMapIndex: 
      isExtra: 0
  - levelDataList:
    - roomType: 8
      isUse: 0
      passBy: 0
-      nodePos: {x: 15.01926, y: 0.059788704, z: -7.669103}
+      nodePos: {x: 12.519215, y: 0.059788704, z: -7.669103}
      line: 11
      column: 0
      fatherLevelNodes: []
@ -594,7 +590,7 @@ MonoBehaviour:
    - roomType: 8
      isUse: 1
      passBy: 0
-      nodePos: {x: 15.019262, y: 0.05979061, z: -6.669107}
+      nodePos: {x: 12.519218, y: 0.05979061, z: -6.669107}
      line: 11
      column: 1
      fatherLevelNodes:
@ -610,7 +606,7 @@ MonoBehaviour:
    - roomType: 8
      isUse: 0
      passBy: 0
-      nodePos: {x: 15.019266, y: 0.05979252, z: -5.669109}
+      nodePos: {x: 12.51922, y: 0.05979252, z: -5.669109}
      line: 11
      column: 2
      fatherLevelNodes: []
@ -625,7 +621,7 @@ MonoBehaviour:
    - roomType: 5
      isUse: 0
      passBy: 0
-      nodePos: {x: 17.019272, y: 0.059796333, z: -7.669105}
+      nodePos: {x: 14.51923, y: 0.059796333, z: -7.669105}
      line: 12
      column: 0
      fatherLevelNodes: []
@ -639,7 +635,7 @@ MonoBehaviour:
    - roomType: 5
      isUse: 1
      passBy: 0
-      nodePos: {x: 17.019276, y: 0.05979824, z: -6.669105}
+      nodePos: {x: 14.519234, y: 0.05979824, z: -6.669105}
      line: 12
      column: 1
      fatherLevelNodes:
@ -655,7 +651,7 @@ MonoBehaviour:
    - roomType: 5
      isUse: 0
      passBy: 0
-      nodePos: {x: 17.019278, y: 0.059800148, z: -5.669108}
+      nodePos: {x: 14.519236, y: 0.059800148, z: -5.669108}
      line: 12
      column: 2
      fatherLevelNodes: []
@ -670,7 +666,7 @@ MonoBehaviour:
    - roomType: 3
      isUse: 0
      passBy: 0
-      nodePos: {x: 19.019293, y: 0.059803963, z: -7.169103}
+      nodePos: {x: 16.51924, y: 0.059803963, z: -7.169103}
      line: 13
      column: 0
      fatherLevelNodes: []
@ -684,7 +680,7 @@ MonoBehaviour:
    - roomType: 3
      isUse: 1
      passBy: 0
-      nodePos: {x: 19.0193, y: 0.05980587, z: -6.169105}
+      nodePos: {x: 16.519245, y: 0.05980587, z: -6.169105}
      line: 13
      column: 1
      fatherLevelNodes:
@ -699,7 +695,7 @@ MonoBehaviour:
    - roomType: 3
      isUse: 0
      passBy: 0
-      nodePos: {x: 19.019308, y: 0.059807777, z: -5.169107}
+      nodePos: {x: 16.519245, y: 0.059807777, z: -5.169107}
      line: 13
      column: 2
      fatherLevelNodes: []
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
@ -13,11 +13,16 @@ MonoBehaviour:
  m_Name: cardDeckList
  m_EditorClassIdentifier: 
  cardDeckList:
-  - 1005
+  - 1001
-  - 2022
+  - 1001
-  - 1005
+  - 1001
-  - 1005
+  - 1002
-  - 1005
+  - 1002
-  - 1005
+  - 1002
-  - 1005
+  - 1003
-  - 1005
+  - 2008
  - 2032
  - 2001
  - 2008
  - 1004
  - 1004
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Color.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Color.prefab
@ -669,8 +669,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u8840\u76FE"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 7a60aa5fec9ac434a8b71587377eeb8c, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 9520594fe7c9c834c80bf41a6accbc29, type: 2}
-  m_sharedMaterial: {fileID: -4989954011452443200, guid: 7a60aa5fec9ac434a8b71587377eeb8c,
+  m_sharedMaterial: {fileID: -510593548764063059, guid: 9520594fe7c9c834c80bf41a6accbc29,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
@ -1702,7 +1702,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, y: -129.2}
+  m_AnchoredPosition: {x: -3, y: -130.3}
  m_SizeDelta: {x: 38.6858, y: 13.6556}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2421509706487664891
@ -1735,8 +1735,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u6D82\u8272\u5361"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 89ef1ec08151aa04cb52a99a61c265eb, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 6ec4515cd39fefb4c813238dc50b382a, type: 2}
-  m_sharedMaterial: {fileID: -4989954011452443200, guid: 89ef1ec08151aa04cb52a99a61c265eb,
+  m_sharedMaterial: {fileID: -510593548764063059, guid: 6ec4515cd39fefb4c813238dc50b382a,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
@ -1761,8 +1761,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 9
+  m_fontSize: 11
-  m_fontSizeBase: 9
+  m_fontSizeBase: 11
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab
@ -669,8 +669,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u8840\u76FE"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 7a60aa5fec9ac434a8b71587377eeb8c, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 9520594fe7c9c834c80bf41a6accbc29, type: 2}
-  m_sharedMaterial: {fileID: -4989954011452443200, guid: 7a60aa5fec9ac434a8b71587377eeb8c,
+  m_sharedMaterial: {fileID: -510593548764063059, guid: 9520594fe7c9c834c80bf41a6accbc29,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
@ -1702,7 +1702,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, y: -96.8}
+  m_AnchoredPosition: {x: -3, y: -96.4}
  m_SizeDelta: {x: 38.6858, y: 13.6556}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2421509706487664891
@ -1735,8 +1735,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u6548\u679C\u724C"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 89ef1ec08151aa04cb52a99a61c265eb, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 6ec4515cd39fefb4c813238dc50b382a, type: 2}
-  m_sharedMaterial: {fileID: -4989954011452443200, guid: 89ef1ec08151aa04cb52a99a61c265eb,
+  m_sharedMaterial: {fileID: -510593548764063059, guid: 6ec4515cd39fefb4c813238dc50b382a,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
@ -1761,8 +1761,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 9
+  m_fontSize: 11
-  m_fontSizeBase: 9
+  m_fontSizeBase: 11
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-0319.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Card_v04-0319.prefab
@ -567,7 +567,7 @@ MonoBehaviour:
  m_fontSizeMin: 0
  m_fontSizeMax: 0
  m_fontStyle: 0
-  m_HorizontalAlignment: 2
+  m_HorizontalAlignment: 8
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
@ -669,8 +669,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u8840\u76FE"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 7a60aa5fec9ac434a8b71587377eeb8c, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 9520594fe7c9c834c80bf41a6accbc29, type: 2}
-  m_sharedMaterial: {fileID: -4989954011452443200, guid: 7a60aa5fec9ac434a8b71587377eeb8c,
+  m_sharedMaterial: {fileID: -510593548764063059, guid: 9520594fe7c9c834c80bf41a6accbc29,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
@ -1758,7 +1758,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, y: -96.2}
+  m_AnchoredPosition: {x: -3, y: -96.7}
  m_SizeDelta: {x: 38.6858, y: 13.6556}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2421509706487664891
@ -1791,8 +1791,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u6548\u679C\u724C"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 89ef1ec08151aa04cb52a99a61c265eb, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 6ec4515cd39fefb4c813238dc50b382a, type: 2}
-  m_sharedMaterial: {fileID: -4989954011452443200, guid: 89ef1ec08151aa04cb52a99a61c265eb,
+  m_sharedMaterial: {fileID: -510593548764063059, guid: 6ec4515cd39fefb4c813238dc50b382a,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
@ -1817,8 +1817,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 9
+  m_fontSize: 11
-  m_fontSizeBase: 9
+  m_fontSizeBase: 11
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Color-Card_v04-0319.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/ForLook/Color-Card_v04-0319.prefab
@ -669,8 +669,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u8840\u76FE"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 7a60aa5fec9ac434a8b71587377eeb8c, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 9520594fe7c9c834c80bf41a6accbc29, type: 2}
-  m_sharedMaterial: {fileID: -4989954011452443200, guid: 7a60aa5fec9ac434a8b71587377eeb8c,
+  m_sharedMaterial: {fileID: -510593548764063059, guid: 9520594fe7c9c834c80bf41a6accbc29,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
@ -1758,7 +1758,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, y: -128.7}
+  m_AnchoredPosition: {x: -3, y: -129.6}
  m_SizeDelta: {x: 38.6858, y: 13.6556}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2421509706487664891
@ -1791,8 +1791,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: "\u6D82\u8272\u5361"
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 89ef1ec08151aa04cb52a99a61c265eb, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 6ec4515cd39fefb4c813238dc50b382a, type: 2}
-  m_sharedMaterial: {fileID: -4989954011452443200, guid: 89ef1ec08151aa04cb52a99a61c265eb,
+  m_sharedMaterial: {fileID: -510593548764063059, guid: 6ec4515cd39fefb4c813238dc50b382a,
    type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
@ -1817,8 +1817,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 9
+  m_fontSize: 11
-  m_fontSizeBase: 9
+  m_fontSizeBase: 11
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab
@ -439,7 +439,7 @@ MonoBehaviour:
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
  m_DynamicPixelsPerUnit: 1
-  m_PresetInfoIsWorld: 1
+  m_PresetInfoIsWorld: 0
 --- !u!114 &8739798778191560965
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
@ -1722,7 +1722,7 @@ MonoBehaviour:
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 83788478}
-  m_Enabled: 0
+  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: e047e05c093a0674c931932f08547152, type: 3}
  m_Name: 
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartPoint.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartPoint.unity
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/TreasurePoint.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/TreasurePoint.unity
@ -12337,6 +12337,7 @@ GameObject:
  m_Component:
  - component: {fileID: 985674836}
  - component: {fileID: 985674835}
  - component: {fileID: 985674837}
  m_Layer: 0
  m_Name: TreasurePointManager
  m_TagString: Untagged
@ -12371,12 +12372,24 @@ Transform:
  m_GameObject: {fileID: 985674834}
  serializedVersion: 2
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 29.491306, y: -4.921896, z: 3.7216744}
+  m_LocalPosition: {x: 6.74, y: -4.921896, z: 3.7216744}
  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!114 &985674837
 MonoBehaviour:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 985674834}
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 56012640fe63dfd47acddd89e32816db, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
 --- !u!1 &1012544604
 GameObject:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
@ -553,9 +553,9 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag
                    //influencePreviewPool.Add(currentNode);
                    //更新涂色预览材质
-                   // SettlementManager.Instance.PreviewSwitchColor(cardEntity.cardOriginalData, currentNode);
+                    SettlementManager.Instance.PreviewSwitchColor(cardEntity.cardOriginalData, currentNode);
                    //更新地块计数
-                    //SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, currentNode);
+                    SettlementManager.Instance.PreviewColorMapUnity(cardEntity.cardOriginalData, currentNode);
                }
                //更新效果作用范围内怪物虚血
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs
@ -308,11 +308,6 @@ public class CardEntity : MonoBehaviour
    }
    public IEnumerator MoveCardToDestory()
    {   
        //移除检查费用变化接口
        if (isLookCard == false && GameManager.Instance != null)
        {
            GameManager.Instance.costChange -= CheckUse;
        }
        //卡牌音效
        AudioManager.Instance.DrawCardVoicePlayer(1);
        //销毁动画
@ -362,8 +357,18 @@ public class CardEntity : MonoBehaviour
    //卡牌销毁
    public void StartMoveCardToDestory()
    {
        stopCostCheck();
        StartCoroutine(MoveCardToDestory());
    }
    public void stopCostCheck()
    {
        //停止费用同步
        //移除检查费用变化接口
        if (isLookCard == false && GameManager.Instance != null)
        {
            GameManager.Instance.costChange -= CheckUse;
        }
    }
    //获取卡牌图片
    public void createCardImage()
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
@ -755,6 +755,8 @@ public class TurnMaster : Singleton<TurnMaster>
        {
            Destroy(selectCardFather.GetChild(i).gameObject);
        }
        CardActiveSort.Instance.ReflashCardPoint();
    }
    //退出选卡界面
@ -773,8 +775,10 @@ public class TurnMaster : Singleton<TurnMaster>
            int count = selectCardFather.childCount;
            for (int i = 0; i < count; i++)
            {
-                usedCard.usedCardList.Add(selectCardFather.GetChild(i).GetComponent<CardEntity>().cardId);
+                CardEntity currentCardEntity = selectCardFather.GetChild(i).GetComponent<CardEntity>();
-                Destroy(selectCardFather.GetChild(i).gameObject);
+                usedCard.usedCardList.Add(currentCardEntity.cardId);
                currentCardEntity.stopCostCheck();
                Destroy(currentCardEntity.gameObject);
            }
        }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs
@ -1695,7 +1695,8 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
            stoneSkinMultiply -= 0.2f * count;
        }
        float halfDamageInBlackMultiply = 1f;
-        MapUnity currentNode = GameManager.Instance.X[positionX].Y[positionY];
+       // MapUnity currentNode = GameManager.Instance.X[positionX].Y[positionY];
        MapUnity currentNode = getNodeTools.LocationToGetNode(positionX, positionY);
        if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.halfDamageInBlack)&&Name.NodeColor.EnemyColor.Contains(currentNode.whoColour))
        {
            stoneSkinMultiply = 0.5f;
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/FightReward/RewardManager.cs
@ -59,7 +59,7 @@ public class RewardManager : Singleton<RewardManager>
        AddRewardTips(RewardManager.RewardType.card,"3");
        AddRewardTips(RewardManager.RewardType.forgPoint, "20");
        AddRewardTips(RewardManager.RewardType.potion, "6001");
-       // AddRewardTips(RewardManager.RewardType.legacy, "LegacyNode_PlatedSteelcaps");
+        AddRewardTips(RewardManager.RewardType.legacy, "LegacyNode_PlatedSteelcaps");
    }
    public void JudgeEnemyOver()//ÅÐ¶ÏÊÇ·ñ½áÊø»ØºÏ
@ -153,22 +153,25 @@ public class RewardManager : Singleton<RewardManager>
    public void GeneratorRewardCard(Transform cardFather ,GameObject cardTip ,int cardCount)
    {
-        List <string> cardAllList = CardOriginalDataList .Instance .existCardOriginalDataList .Keys .ToList();
+        List <string> cardAllList = CardOriginalDataList .Instance .cardOriginalDataList .Keys .ToList();
        Debug.Log("¿¨ÅÆÊýÁ¿"+cardAllList.Count);
        List<string> cardList = new List<string> ();
-        for (int i=0;i<cardCount ;i++)
+        for (int i=0;i<cardCount-1;i++)
        {
            cardList.Add(cardAllList[UnityEngine.Random.Range(0, cardAllList.Count)]);
        }
-         for(int i =0;i<cardList .Count;i++)
+        //¼ÓÈëÒ»ÕÅÐ§¹û¿¨
-         {
+        List<string> effectCardAllList = CardOriginalDataList.Instance.effectCardOriginalDataList.Keys.ToList();
        cardList.Add(effectCardAllList[UnityEngine.Random.Range(0, effectCardAllList.Count)]);
        for (int i =0;i<cardList .Count;i++)
        {
            var currentCard = CreateCardWithIDForReward(cardList[i], cardFather);
            currentCard.transform.localScale = new Vector3(1.6f, 1.6f, 1.6f);
            RewardCardNode rewardCardNode = currentCard.AddComponent<RewardCardNode>();
            rewardCardNode.cardID = cardList[i];          
            rewardCardNode.rewardTip = cardTip;
            currentCard.transform.GetComponent<Button>().onClick.AddListener(rewardCardNode.RewardCardToDeck);
-         }
+        }
        cardRewardList = cardList;
    }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyManager.cs
@ -83,6 +83,9 @@ public class LegacyManager : Singleton <LegacyManager>
    private void Start()
    {
        DontDestroyOnLoad(this.gameObject);
        foreach (var node in legacyNodesList.Keys)
            Debug.Log("legacyNodesList.Keys" + node);
    }
    public void tryUseLegacy(string legacyName)
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyNode.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyNode.cs
@ -17,7 +17,11 @@ public class LegacyNode : MonoBehaviour
    //构造函数
    public virtual void CreateLegacy(string className,bool isOnGet)
    {
-        
+        Debug.Log("字典数量"+LegacyManager.Instance.legacyNodesList.Keys.Count);
        foreach (var legacyNode in LegacyManager.Instance.legacyNodesList.Keys)
        {
            Debug.Log("遗物" + legacyNode);
        }
        List<string> relicData = LegacyManager.Instance.relicsDictionary[className];
        relicName = relicData[3];
        relicClassName = relicData[1];
@ -40,11 +44,11 @@ public class LegacyNode : MonoBehaviour
        infor = relicData[4];
        image = ToolDontDestory.Instance.LoadImage(relicData[2]);
        transform.GetChild(0).GetComponent<Image>().sprite = image;
-        LegacyManager.Instance.legacyNodesList.Add(relicName,this);
+       /* LegacyManager.Instance.legacyNodesList.Add(relicName,this);
        if (isOnGet)
        {
            OnGet();
-        }
+        }*/
    }
    //获得的一次性效果
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Shop/ShopManager.cs
@ -133,12 +133,15 @@ public class ShopManager : Singleton <ShopManager>
        }
        for(int i=0;i< 6;i++)
        {
-            int cardId = (int)Random.Range(1001, 1005);
+            List<string> colorCard = CardOriginalDataList.Instance.cardOriginalDataList.Keys.ToList();
            List<string> allCards = CardOriginalDataList.Instance.effectCardOriginalDataList.Keys.ToList();
            allCards .AddRange (colorCard);
            string cardId = allCards[(int)Random.Range(0, allCards.Count)];
            var currentSaleCardNode = Instantiate(saleCardNode, cardFather);
-            var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardId.ToString(), currentSaleCardNode.transform);
+            var card = PlayerStatsManager.Instance.CreateCardWithIDForLook(cardId, currentSaleCardNode.transform);
            card.transform.localPosition = new Vector3(0, 0, 0);
            card.transform.SetAsFirstSibling();
-            currentSaleCardNode.GetComponent<CardSaleNode>().cardID = cardId.ToString ();
+            currentSaleCardNode.GetComponent<CardSaleNode>().cardID = cardId;
            saleCardList.Add(currentSaleCardNode);
        } 
    }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/StartPoint.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/StartPoint.meta
@ -0,0 +1,8 @@
 fileFormatVersion: 2
 guid: 6b60a8f5307668c49a1f4d0c1aefc63f
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/StartPoint/StartPointManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/StartPoint/StartPointManager.cs
@ -0,0 +1,34 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 public class StartPointManager : MonoBehaviour
 {
    public GameObject beforeChooseTalk;
    public GameObject afterChooseTalk;
    public GameObject nextButton;
    public GameObject chooseButton;
    public void AddMoney()
    {
        PlayerStatsManager.Instance.EffectFunction(Name.Reward.Money, "30");
    }
    public void AddForgingPoint()
    {
        PlayerStatsManager.Instance.EffectFunction(Name.Reward.ForgingPoint, "8");
    }
    public void AddHP()
    {
        PlayerStatsManager.Instance.playerState.maxHP += 5;
        PlayerStatsManager.Instance.EffectFunction(Name.Reward.Hp, "5");
    }
    public void WaitToNext()
    {
        beforeChooseTalk.SetActive(false);
        afterChooseTalk.SetActive(true);
        chooseButton.SetActive(false);
        nextButton.SetActive(true);
    }
 }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/StartPoint/StartPointManager.cs.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/StartPoint/StartPointManager.cs.meta
@ -0,0 +1,11 @@
 fileFormatVersion: 2
 guid: 6e78a575897f46545898615ee98dadb5
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/SettlementManager.cs
@ -258,6 +258,7 @@ public class SettlementManager : Singleton<SettlementManager>
            if (endNode != null)
            {
                //endNode.switchColor(Name.stringColorToint(cardOriginalData.nodesColor[i]));
                endNode.switchPreColor(Name.stringColorToint(cardOriginalData.nodesColor[i]));
            }
        }
@ -1012,7 +1013,8 @@ public class SettlementManager : Singleton<SettlementManager>
                case CardFunction.discard:
                    LegacyManager.Instance.tryUseLegacy(Name.Legacy.LegacyNode_WasteReconstructor);
                    LegacyManager.Instance.tryUseLegacy(Name.Legacy.LegacyNode_BigBackpack);
-                    yield return StartCoroutine(TurnMaster.Instance.randomDiscard(int.Parse(kvp.Value)));
+                    // yield return StartCoroutine(TurnMaster.Instance.randomDiscard(int.Parse(kvp.Value)));之前丢卡函数
                    TurnMaster.Instance.EnterSelectCard(int.Parse(kvp.Value));//现在丢卡函数
                    //yield return StartCoroutine(TurnMaster.Instance.MoveCards());
                    /*yield return new WaitForEndOfFrame();
                    StartCoroutine(TurnMaster.Instance.MoveCards());*/
--- a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_5.csv
+++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_5.csv
@ -11,6 +11,6 @@
 1012,1,0,1,3_1,none,none,none,0_0;1_0;0_1,yellow;red;blue,CardIcon/1019,彩球,1
 1013,1,2,1,3_1,none,2,10,1_0;0_-1;0_1;2_0;1_-1;1_1;3_0;2_1;2_-1,red;red;red;blue;blue;blue;yellow;yellow;yellow,CardIcon/1020,九宫格,2
 1014,1,2,1,3_1,none,1,7,1_0;2_0;3_0;-1_1;-1_2;-2_3;-1_-1;-1_-2;-2_-3,red;red;red;yellow;yellow;yellow;blue;blue;blue,CardIcon/1021,三色线,2
-1016,1,1,1,3_1,none,53,2月3日,0_0;1_0;2_0;0_1;0_-1;1_2;1_-2,red;red;red;red;red;red;red,CardIcon/1021,散射,1
+1016,1,1,1,3_1,none,53,2-3,0_0;1_0;2_0;0_1;0_-1;1_2;1_-2,red;red;red;red;red;red;red,CardIcon/1021,散射,1
 1017,1,2,1,3_1,none,17,1,0_0;1_0;2_0;3_0;2_1;2_-1;2_2;2_-2,blue;blue;blue;blue;blue;blue;blue;blue,CardIcon/1021,单向箭头,2
 1007,1,3,1,3_1,none,1,32,0_0;1_0;0_1;0_-1;1_1;1_-1;1_2;1_-2,black;black;black;black;black;black;black;black,CardIcon/1021,黑火药,3
--- a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv
+++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/card_data_effect_4.csv
@ -10,18 +10,18 @@
 2009,1,0,11;93,1;1,none,none,none,none,0_0,EffectCardIcon/玫瑰茶,0,1,1,玫瑰茶,none
 2012,1,1,40;93,-1;2,none,none,none,none,0_0,EffectCardIcon/冷静,0,1,0,冷静,none
 2014,1,1,57,4,blue>9,57,2,none,0_0,EffectCardIcon/割裂,0,2,0,割裂,none
-2015,1,2,1,100,yellow>4,53,5月3日,1,0_0,EffectCardIcon/左右开弓,1,3,0,左右开弓,none
+2015,1,2,1,100,yellow>4,53,5-3,1,0_0,EffectCardIcon/左右开弓,1,3,0,左右开弓,none
 2016,1,1,82,1,none,none,none,none,0_0,EffectCardIcon/消失,0,3,1,消失,none
 2017,1,1,83,3,yellow>4,93,1,none,0_0,EffectCardIcon/死亡印记,1,3,0,死亡印记,none
 2018,1,1,84;85,1;1,yellow>5,33,1,none,0_0,EffectCardIcon/暗影步,1,2,0,暗影步,none
-2019,1,3,94,10,red>12,95,5月2日,94,0_0,EffectCardIcon/影舞步,1,2,0,影舞步,none
+2019,1,3,94,10,red>12,95,5-2,94,0_0,EffectCardIcon/影舞步,1,2,0,影舞步,none
 2021,1,1,90,1,blue>7,89,1,none,0_0,EffectCardIcon/血怒,0,3,1,血怒,none
 2022,1,3,68,1,red>5,69,1,68,0_0,EffectCardIcon/抽血,1,3,0,抽血,none
 2023,1,1,52,2,yellow>5,52,3,52,0_0,EffectCardIcon/踢击,1,1,0,踢击,none
 2024,1,1,52,1,red>10,52,2,52,0_1;1_0;0_-1;-1_0;-1_1;-1_-1,EffectCardIcon/展翅,0,1,0,展翅,击退2格
 2026,1,1,40,2,blue>5,16,1,none,0_0,EffectCardIcon/疾跑,0,2,0,疾跑,none
 2027,1,2,5;58,2;2,blue>10,5;58,3;3,5;58,0_0,EffectCardIcon/穷追猛砍,1,2,0,穷追猛砍,none
-2028,1,1,53,6月2日,aroundblue=4,53,6月4日,53,0_1;1_0;0_-1;-1_0;-1_1;-1_-1,EffectCardIcon/剑刃风暴,1,3,0,剑刃风暴,none
+2028,1,1,53,6-2,aroundblue=4,53,6-4,53,0_1;1_0;0_-1;-1_0;-1_1;-1_-1,EffectCardIcon/剑刃风暴,1,3,0,剑刃风暴,none
 2029,1,1,59,1,blue>11,60,1,59,0_0,EffectCardIcon/暴风吸入,0,2,1,暴风吸入,随机留下一半
 2030,1,1,60,1,yellow>10,61,1,60,0_0,EffectCardIcon/汲取,0,2,0,汲取,none
 2031,1,0,12,1,red>9,91,1,91,0_0,EffectCardIcon/再来一杯,0,2,0,再来一杯,none
--- a/ColorlessWorld-2024-4-2/Assets/TextMesh
+++ b/ColorlessWorld-2024-4-2/Assets/TextMesh
--- a/ColorlessWorld-2024-4-2/Assets/TextMesh
+++ b/ColorlessWorld-2024-4-2/Assets/TextMesh
@ -0,0 +1,8 @@
 fileFormatVersion: 2
 guid: 9520594fe7c9c834c80bf41a6accbc29
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
  userData: 
  assetBundleName: 
  assetBundleVariant: 
--- a/Materials/OutLineSourceHanSansCN-Normal
+++ b/Materials/OutLineSourceHanSansCN-Normal