初步流程整合

11 months ago · e2df11c9ca
43 changed files with 622 additions and 200 deletions
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/LevelDate/LevelState_1.asset
@ -91,8 +91,7 @@ MonoBehaviour:
      - {x: 2, y: 0}
      - {x: 2, y: 2}
      fightEenemyPool: weak
-      enemyList:
-      - 4010
+      enemyList: []
      extraEnemyList: []
      mapIndex: 100001
      extraMapIndex: 
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset
@ -14,13 +14,13 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  playerName: Julius
  maxStepRange: 5
-  currentStepRange: 0
-  maxCost: 3
-  currentCost: 3
+  currentStepRange: 5
+  maxCost: 30
+  currentCost: 30
  maxShieldValue: 0
  currentShieldValue: 0
  maxHP: 1000
-  currentHP: 1000
+  currentHP: 843
  cardRewardNumToChoose: 0
  cardRewardNumToGget: 0
  canColorCount: 20
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/cardDeckList.asset
@ -13,15 +13,11 @@ MonoBehaviour:
  m_Name: cardDeckList
  m_EditorClassIdentifier: 
  cardDeckList:
-  - 2008
-  - 2032
-  - 2004
-  - 2015
-  - 2015
-  - 2015
-  - 1009
-  - 2015
-  - 2015
-  - 2015
-  - 1010
-  - 1010
+  - 1001
+  - 1001
+  - 1001
+  - 1002
+  - 1002
+  - 1002
+  - 1003
+  - 1003
--- a/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-5.mat
+++ b/ColorlessWorld-2024-4-2/Assets/Materials/Map/FireMap-5.mat
@ -31,7 +31,7 @@ Material:
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
-  m_CustomRenderQueue: 3001
+  m_CustomRenderQueue: 2001
  stringTagMap: {}
  disabledShaderPasses: []
  m_LockedProperties: 
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AcidRainCloud.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/AcidRainCloud.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 18
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoundSoul.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/BoundSoul.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 3
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Climavista.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Climavista.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 19
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ContaminatusImmortalis.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ContaminatusImmortalis.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 15
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/FailedSample.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/FailedSample.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 2
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Gravitus.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Gravitus.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 12
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Leviathan.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Leviathan.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 16
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/LivingArmor.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/LivingArmor.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 4
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Pharmacist.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Pharmacist.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 7
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Pollutinel.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Pollutinel.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 14
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/PollutionSpreader.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/PollutionSpreader.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 11
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/PrismReflector.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/PrismReflector.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 10
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RatWarrior.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/RatWarrior.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 5
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ReconnaissanceBee.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ReconnaissanceBee.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 9
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SoulMaker.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/SoulMaker.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 6
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/StonePillar.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/StonePillar.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 17
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Thief.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Thief.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 13
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Twinbee.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Twinbee.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 8
+  enemyScript: 0
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -127,6 +127,7 @@ MonoBehaviour:
  blockUIBar: {fileID: 0}
  enemyUI: {fileID: 0}
  followPoint: {fileID: 8888823514061126702}
+  followPointPostion: {x: 0, y: 0.2, z: -0.35}
  bone: {fileID: 0}
  bone_Re: {fileID: 0}
  lasteHp: 0
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/BoundSoul.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/BoundSoul.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 3
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/FailedSample.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/FailedSample.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 2
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Leviathan.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Leviathan.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 16
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/LivingArmor.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/LivingArmor.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 4
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/RatWarrior.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/RatWarrior.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 5
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/SoulMaker.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/SoulMaker.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 6
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Twinbee.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Twinbee.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 8
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/ChooseWeapon.unity
@ -24385,17 +24385,17 @@ MonoBehaviour:
    - 1001
  - cardGroupFathers: {fileID: 1514211913}
    cardIDGroup:
-    - 1001
-    - 1001
-    - 1001
+    - 1002
+    - 1002
+    - 1002
  - cardGroupFathers: {fileID: 1424524448}
    cardIDGroup:
-    - 1001
-    - 1001
+    - 1003
+    - 1003
  - cardGroupFathers: {fileID: 25128810}
    cardIDGroup:
-    - 1002
-    - 1003
+    - 2032
+    - 2001
  cardGroup_1: []
  cardGroup_2: []
  cardGroup_3: []
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/SampleScene.unity
@ -16446,7 +16446,6 @@ MonoBehaviour:
  shield: 0
  totalCost: 0
  lasteShield: 0
-  buffSettleList: []
  buffIconList: []
  buffPanle: {fileID: 365854624}
  buffIcon: {fileID: 610775712955856159, guid: 457a3d2dee855fa41a324600bf63e57f, type: 3}
@ -43752,7 +43751,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &1583609271
 RectTransform:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity
+++ b/ColorlessWorld-2024-4-2/Assets/Scenes/StartMainScence.unity
@ -7260,6 +7260,69 @@ Transform:
  m_Children: []
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &707353373
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 707353375}
+  - component: {fileID: 707353374}
+  m_Layer: 0
+  m_Name: PlayerStatsManager
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &707353374
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 707353373}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4f47edfc6a4071b418c9f81b172bb82f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  playerState: {fileID: 11400000, guid: afd7daa84e9985b45bd00c91505acb37, type: 2}
+  levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2}
+  cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2}
+  relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2}
+  potionList: {fileID: 11400000, guid: 3f5489bb993421645aaa1e0533c7c81d, type: 2}
+  colorSortList: 010000000300000004000000
+  colorCardForLook: {fileID: 4169693119190854323, guid: e4e5b990a3d777546838da14ca5f327e,
+    type: 3}
+  effectCardForLook: {fileID: 4169693119190854323, guid: 40bf5c05b051c8041a97b1321dc42677,
+    type: 3}
+  colorCardPrefab: {fileID: 4169693119190854323, guid: 2eeef6ac48d2485428f20cbaf7c3e56a,
+    type: 3}
+  effectCardPrefab: {fileID: 4169693119190854323, guid: bdcfd7162d83e1f48b83e1c8a39cf6ce,
+    type: 3}
+  itemCsvFilePath: LevelMapToItem.csv
+  itemLimitCsvFilePath: MapItemCount.csv
+  isPass: 0
+  isTreasure: 0
+  enemyCanColorNextNode: 1
+--- !u!4 &707353375
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 707353373}
+  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 &709795120
 GameObject:
  m_ObjectHideFlags: 0
@ -15927,67 +15990,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1517792570}
  m_CullTransparentMesh: 1
--- !u!1 &1518257280
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1518257282}
-  - component: {fileID: 1518257281}
-  m_Layer: 0
-  m_Name: PlayerStatsManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!114 &1518257281
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1518257280}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 4f47edfc6a4071b418c9f81b172bb82f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  playerState: {fileID: 11400000, guid: afd7daa84e9985b45bd00c91505acb37, type: 2}
-  levelDevelopData: {fileID: 11400000, guid: 587726a845a2bc7498172485a1bd194b, type: 2}
-  cardDeck: {fileID: 11400000, guid: 1126a56dae0a1ab40821c18c251900ef, type: 2}
-  relicList: {fileID: 11400000, guid: 0ccbda8ca8e9a4146aebd15491d3b067, type: 2}
-  potionList: {fileID: 11400000, guid: 3f5489bb993421645aaa1e0533c7c81d, type: 2}
-  colorSortList: 010000000300000004000000
-  commonCardForLook: {fileID: 4169693119190854323, guid: 40bf5c05b051c8041a97b1321dc42677,
-    type: 3}
-  legendaryCardForLook: {fileID: 4169693119190854323, guid: 40bf5c05b051c8041a97b1321dc42677,
-    type: 3}
-  rareCardForLook: {fileID: 4169693119190854323, guid: 40bf5c05b051c8041a97b1321dc42677,
-    type: 3}
-  itemCsvFilePath: LevelMapToItem.csv
-  itemLimitCsvFilePath: MapItemCount.csv
-  isPass: 0
-  isTreasure: 0
-  enemyCanColorNextNode: 1
--- !u!4 &1518257282
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1518257280}
-  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 &1535934833
 GameObject:
  m_ObjectHideFlags: 0
@ -25996,7 +25998,6 @@ SceneRoots:
  - {fileID: 1393863277}
  - {fileID: 623796532}
  - {fileID: 227687490}
-  - {fileID: 1518257282}
  - {fileID: 1817400298}
  - {fileID: 676333709}
  - {fileID: 1010659529}
@ -26009,3 +26010,4 @@ SceneRoots:
  - {fileID: 61966381}
  - {fileID: 365522763}
  - {fileID: 743889017}
+  - {fileID: 707353375}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff.cs
@ -57,4 +57,13 @@ public class Buff
    {
        return this;
    }
+    public virtual Buff CopyBuff()
+    {
+        Buff newBuff = new Buff();
+        newBuff .value = value;
+        newBuff .icon = icon;
+        newBuff .iconPath = iconPath;
+        newBuff .count = count;
+        return newBuff;
+    }
 }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs
@ -133,6 +133,8 @@ public class EnemyManager : Singleton<EnemyManager>
            enemyCount += 1;
            
            yield return new WaitUntil(()=>enemyTurnState==EnemyTurnState.runing);
+            PlayerStatsManager.Instance.EffectFunction(6, "下一个");
+            yield return new WaitForSeconds(1f);
            Debug.Log("enemyCountÊÇ"+enemyCount);
            if (enemyCount >= enemySpeedSortingListCopy.Count)
            {
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs
@ -1558,8 +1558,9 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
        //enemy.enemyTurnEnd();
        foreach (var key in EnemyState.abnormalCondition.Keys.ToList())
        {
+            
            EnemyState.abnormalCondition[key].SettleEnemy(this);
-            abnormalConditionEndCheck();
+            abnormalConditionEndCheck();  
            enemyUIBar. RefreshEnemyBuffIcon();
        }
    }
--- 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()//判断是否结束回合
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyManager.cs
@ -17,9 +17,15 @@ public class LegacyManager : Singleton <LegacyManager>

    public HashSet<string> shopRelicsSet = new HashSet<string>
    {
-        Name .Legacy .LegacyNode_BloodBorne,
-        Name .Legacy .LegacyNode_BloodTax,
-        Name .Legacy .LegacyNode_Parasol
+        Name .Legacy .LegacyNode_Parasol,
+        Name .Legacy .LegacyNode_BigBackpack,
+        Name .Legacy .LegacyNode_FreeBullet,
+        Name .Legacy .LegacyNode_Cheese,
+        Name .Legacy .LegacyNode_LightningBoots,
+        Name .Legacy .LegacyNode_Bipod,
+        Name .Legacy .LegacyNode_PortableReactor,
+        Name .Legacy .LegacyNode_NurturingBloom,
+        Name .Legacy .LegacyNode_PurityBadge
    }
    ;

--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/EnemyState_SO.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Data_SO/EnemyState_SO.cs
@ -65,9 +65,18 @@ public class EnemyState_SO : ScriptableObject
            object value = prop.GetValue(source);
            prop.SetValue(this, value);
        }
-        abnormalCondition= new Dictionary<string, Buff>(source.abnormalCondition);
+        // abnormalCondition= new Dictionary<string, Buff>(source.abnormalCondition);
+        abnormalCondition = new Dictionary<string, Buff>();
+        foreach (string key in source .abnormalCondition .Keys .ToList ())
+        {
+            abnormalCondition.Add(key, source.abnormalCondition[key].CopyBuff());
+        }
    }

+    public void copyAbnormalCondition()
+    {
+
+    }
    public EnemyState_SO()
    {
    }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/DestructionManager.cs
@ -24,6 +24,10 @@ public class DestructionManager : Singleton<DestructionManager>
                yield return StartCoroutine(TurnMaster.Instance.MoveCards());
            }
            TurnMaster.Instance.usedCard.deleteCardList.Add(target.GetComponent<CardEntity>().CardId);
+            if (TurnMaster.Instance.usedCard.deleteCardList.Count >0)
+            {
+                TurnMaster.Instance.deleteCardNumberText.transform.parent.gameObject.SetActive(true);
+            }
        }
        TurnMaster.Instance.handCard.cardEntityList.Remove(target.GetComponent<CardEntity>());
       // target.GetComponent<CardEntity>().MoveCardToDestoryDelay();
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs
@ -19,8 +19,6 @@ public class Usermanager : Singleton<Usermanager>
    [Header ("Buff状态")]
    public static Dictionary<string, Buff > playerAbnormalCondition = new Dictionary<string, Buff >();//异常状态

-    public List<string> buffSettleList = new List<string>();//回合结束时结算
-
    [Header("Buff状态UI组件")]
    //角色身上
    public List<GameObject> buffIconList = new List<GameObject>();
@ -330,21 +328,7 @@ public class Usermanager : Singleton<Usermanager>
        }

    }
-    //回合结束时结算buff
-    public void BuffSettleInEndTurn()
-    {
-        foreach (var key in buffSettleList)
-        {
-            Buff buff = playerAbnormalCondition[key];
-            buff.value--;
-            if (buff.value <= 0)
-            {
-                playerAbnormalCondition.Remove(key);
-            }
-        }
-        buffSettleList.Clear();
-        RefreshPlayerBuffIcon();
-    }
+
    //检查移除已归零buff
    public void AbnormalConditionEndCheck()
    {
--- a/ColorlessWorld-2024-4-2/Assets/StreamingAssets/EnemyPoolToLevel.csv
+++ b/ColorlessWorld-2024-4-2/Assets/StreamingAssets/EnemyPoolToLevel.csv
@ -2,8 +2,8 @@
 101,elite,20,4001;4002;4002;4002,100001
 102,weak,20,4003;4003;4004,100001
 103,elite,20,4005;4006,100001
-104,weak,20,4007;4008;4008,100001
-105,weak,20,4007;4008;4008;4008,100001
+104,weak,20,4007;4008,100001
+105,weak,20,4007;4008;4008,100001
 106,strong,33,4013;4014,100001
 107,strong,33,4015;4016,100001
 108,strong,33,4017;4018,100001
--- a/Materials/OutLineSourceHanSansCN-Normal
+++ b/Materials/OutLineSourceHanSansCN-Normal
--- a/ColorlessWorld-2024-4-2/Assets/TextMesh
+++ b/ColorlessWorld-2024-4-2/Assets/TextMesh