Merge pull request '怪物修缮' (#95) from dev-0325-yjm into dev-1217

Reviewed-on: #95
9 months ago · 0bc24741a3
93 changed files with 2130 additions and 192 deletions
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/AcidRainCloud.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 2
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 5
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/BoundSoul.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/BoundSoul.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 4
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Climavista.asset
@ -16,7 +16,7 @@ MonoBehaviour:
  enemyIcon: {fileID: 21300000, guid: bd8f3094e7ef01148bddd857e065ebc3, type: 3}
  stepRange: 2
  stepRangeMultiplier: 1
-  speed: 2
+  speed: 5
  maxMoveCoolDown: 0
  currentMoveCoolDown: 0
  shieldValue: 0
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 13
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/ContaminatusImmortalis.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/ContaminatusImmortalis.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 2
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 10
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/FailedSample.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/FailedSample.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 5
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Gravitus.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Gravitus.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 10
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Leviathan.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Leviathan.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 2
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 24
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/LivingArmor.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/LivingArmor.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 5
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pharmacist.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pharmacist.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 8
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pollutinel.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Pollutinel.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 2
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 5
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/PollutionSpreader.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/PollutionSpreader.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 2
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 9
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/PrismReflector.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/PrismReflector.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 2
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 10
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/RatWarrior.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/RatWarrior.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 3
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/ReconnaissanceBee.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/ReconnaissanceBee.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 6
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/SoulMaker.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/SoulMaker.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 19
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/StonePillar.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/StonePillar.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 3
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Thief.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Thief.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 5
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Twinbee.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/Enemy/Twinbee.asset
@ -33,3 +33,4 @@ MonoBehaviour:
  aoeRange: 0
  maxNumberOfHits: 0
  currentNumberOfHits: 0
+  polluteNodeNum: 4
--- a/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset
+++ b/ColorlessWorld-2024-4-2/Assets/GameDate/PlayerState.asset
@ -13,14 +13,14 @@ MonoBehaviour:
  m_Name: PlayerState
  m_EditorClassIdentifier: 
  playerName: Julius
-  maxStepRange: 2
-  currentStepRange: 2
+  maxStepRange: 5
+  currentStepRange: 0
  maxCost: 3
-  currentCost: 1
+  currentCost: 3
  maxShieldValue: 0
  currentShieldValue: 0
-  maxHP: 68
-  currentHP: 68
+  maxHP: 1000
+  currentHP: 1000
  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,9 +13,15 @@ MonoBehaviour:
  m_Name: cardDeckList
  m_EditorClassIdentifier: 
  cardDeckList:
-  - 1001
-  - 1002
-  - 1003
-  - 1004
-  - 1005
-  - 1006
+  - 2008
+  - 2032
+  - 2004
+  - 2015
+  - 2015
+  - 2015
+  - 1009
+  - 2015
+  - 2015
+  - 2015
+  - 1010
+  - 1010
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v03-Common.prefab
@ -452,23 +452,40 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  cardId: 0
-  cost: {fileID: 7944922551607220993}
+  cost: {fileID: 0}
  cardIndex: 0
-  cardDescription: {fileID: 4157078162787977941}
-  cardName: {fileID: 6020088242945090177}
-  cardType: {fileID: 7547543933361732122}
-  cardTypeImage: {fileID: 2180037887096685672}
+  cardDescription: {fileID: 0}
+  cardName: {fileID: 0}
+  cardType: {fileID: 0}
  cardImage: {fileID: 2030393732758620615}
-  midBorder: {fileID: 0}
-  topBorder: {fileID: 3893753280325337861}
-  cardRelease: {fileID: 6139004980639369640}
-  cardEffectRange: {fileID: 3698325467319520071}
-  gem: {fileID: 0}
  canUse: 1
+  fun1Image: {fileID: 0}
+  fun2Image: {fileID: 0}
+  fun3Image: {fileID: 0}
+  successCondition: {fileID: 0}
+  unsuccessCondition: {fileID: 0}
+  fun1Val: {fileID: 0}
+  fun2Val: {fileID: 0}
+  fun3Val: {fileID: 0}
+  cardBulletFatherPrefab: {fileID: 0}
  smallCardPrefab: {fileID: 3615574969851259241, guid: 2f88da2f5ca2fbc438b76c3faf2ea9db,
    type: 3}
  noSmallCard: 0
  noSyncText: 0
+  isLookCard: 0
+  conditionList: []
+  trueFun: {fileID: 0}
+  trueFunPrefab: {fileID: 0}
+  nodeColorResultFrame: {fileID: 0}
+  nodeColorResultImage: {fileID: 0}
+  castRange: {fileID: 0}
+  colorConditon: {fileID: 0}
+  cardDataSummary: {fileID: 0}
+  animator: {fileID: 0}
+  borderAnim: {fileID: 0}
+  currentCost: 0
+  currentCostType: 
+  tempIsDisposable: 0
 --- !u!114 &5545682449418996990
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/CardPrefab/Card_v04-Common.prefab
@ -1182,7 +1182,7 @@ MonoBehaviour:
  borderAnim: {fileID: 4731515924597847675}
  currentCost: 0
  currentCostType: 
-  tempIsDisposable: 1
+  tempIsDisposable: 0
 --- !u!114 &5545682449418996990
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/FailedSample.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/FailedSample.prefab
@ -156,6 +156,9 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
+  deathVfx: {fileID: 0}
+  deathParticle: {fileID: 0}
+  deathParticle_2: {fileID: 0}
  canMove: 0
  planAction: 0
 --- !u!114 &-313844801110827053
@ -171,10 +174,10 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  enemyNode: {fileID: 0}
+  aimNode: {fileID: 0}
  layerMask:
    serializedVersion: 2
    m_Bits: 0
-  time: 0.2
  moveSpeed: 4
 --- !u!95 &4358100366385517192
 Animator:
--- 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: 0
+  enemyScript: 12
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Leviathan.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Leviathan.prefab
@ -156,6 +156,9 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
+  deathVfx: {fileID: 0}
+  deathParticle: {fileID: 0}
+  deathParticle_2: {fileID: 0}
  canMove: 0
  planAction: 0
 --- !u!95 &4358100366385517192
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/LivingArmor.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/LivingArmor.prefab
@ -156,6 +156,9 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
+  deathVfx: {fileID: 0}
+  deathParticle: {fileID: 0}
+  deathParticle_2: {fileID: 0}
  canMove: 0
  planAction: 0
 --- !u!114 &660637923113862811
@ -171,10 +174,10 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  enemyNode: {fileID: 0}
+  aimNode: {fileID: 0}
  layerMask:
    serializedVersion: 2
    m_Bits: 0
-  time: 0.2
  moveSpeed: 4
  isDead: 0
 --- !u!95 &4358100366385517192
--- 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: 0
+  enemyScript: 7
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 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: 0
+  enemyScript: 14
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 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: 0
+  enemyScript: 11
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 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: 0
+  enemyScript: 10
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 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: 0
+  enemyScript: 5
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 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: 0
+  enemyScript: 9
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 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: 0
+  enemyScript: 6
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 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: 0
+  enemyScript: 17
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 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: 0
+  enemyScript: 13
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -200,6 +200,9 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 0
  moveSpeed: 4
+  aliveCount: 0
+  stolenForgingPointCount: 0
+  stolenMoney: 0
 --- !u!1 &2687402414900403258
 GameObject:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Twinbee.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Twinbee.prefab
@ -156,6 +156,9 @@ MonoBehaviour:
    m_PreInfinity: 2
    m_PostInfinity: 2
    m_RotationOrder: 4
+  deathVfx: {fileID: 0}
+  deathParticle: {fileID: 0}
+  deathParticle_2: {fileID: 0}
  canMove: 0
  planAction: 0
 --- !u!114 &3774938986533578087
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/AcidRainCloud.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/AcidRainCloud.prefab
@ -0,0 +1,578 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1253231568001379261
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4276721484070507378}
+  - component: {fileID: 7989887375954300062}
+  - component: {fileID: 230642570694684005}
+  - component: {fileID: 4358100366385517192}
+  - component: {fileID: 8215840690744605514}
+  m_Layer: 9
+  m_Name: AcidRainCloud
+  m_TagString: Enemy
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4276721484070507378
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  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:
+  - {fileID: 719232722191935980}
+  - {fileID: 8888823514061126702}
+  - {fileID: 6503119109324506896}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &7989887375954300062
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Radius: 0.48
+  m_Center: {x: 0, y: 0.3, z: 0}
+--- !u!114 &230642570694684005
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b93e606dce1c400408bd059eaaa399b2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  templateEnemyState: {fileID: 11400000, guid: a5d77befe00f98245a906ec5f250baf1, type: 2}
+  EnemyState: {fileID: 0}
+  positionX: 3
+  positionY: 5
+  pasth: []
+  oppositePasth: []
+  moveType: 0
+  enemy: {fileID: 0}
+  rangePool: []
+  aoeRangePool: []
+  stateText: 
+  jumpHeight: 1
+  posCount: 7
+  jumpSpeed: 25
+  speedCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0.00000032782555
+      value: 1.0011742
+      inSlope: -1.4465826
+      outSlope: -1.4465826
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0.7666647
+    - serializedVersion: 3
+      time: 0.49999422
+      value: 0.700547
+      inSlope: -0.011173545
+      outSlope: -0.011173545
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1.0000062
+      value: 1.0063303
+      inSlope: 1.4297178
+      outSlope: 1.4297178
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.36145905
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  enemyType: 0
+  enemyScript: 18
+  lineAim: {fileID: 7509110568895175458}
+  canLineAppre: 1
+  disableAttack: {fileID: 0}
+  enemyUIBar: {fileID: 0}
+  blockUIBar: {fileID: 0}
+  enemyUI: {fileID: 0}
+  followPoint: {fileID: 8888823514061126702}
+  bone: {fileID: 0}
+  bone_Re: {fileID: 0}
+  lasteHp: 0
+  anim: {fileID: 4358100366385517192}
+  meleeAttackSpeed: 4
+  meleeAttackSpeedCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  deathVfx: {fileID: 0}
+  deathParticle: {fileID: 0}
+  deathParticle_2: {fileID: 0}
+  canMove: 0
+  planAction: 0
+--- !u!95 &4358100366385517192
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 68841ed7bed30c841bf31d58a61fa4e8, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &8215840690744605514
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0d79ad6169a7e3249929c9b64a492eec, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  enemyNode: {fileID: 0}
+  aimNode: {fileID: 0}
+  layerMask:
+    serializedVersion: 2
+    m_Bits: 0
+  moveSpeed: 4
+--- !u!1 &2687402414900403258
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8888823514061126702}
+  m_Layer: 0
+  m_Name: FollowPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8888823514061126702
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2687402414900403258}
+  m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494}
+  m_LocalPosition: {x: 0, y: 0, z: -0.284}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4276721484070507378}
+  m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -0.253, y: 0.245}
+  m_SizeDelta: {x: 1.164, y: 0.6462}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7371518073400580404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6494013583369413442}
+  - component: {fileID: 190055425036644223}
+  m_Layer: 9
+  m_Name: Floor
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6494013583369413442
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371518073400580404}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.000000029802319, z: 0.000000029802319, w: 1}
+  m_LocalPosition: {x: -0.25873265, y: -3.6226575, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 719232722191935980}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &190055425036644223
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371518073400580404}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -696370157
+  m_SortingLayer: 2
+  m_SortingOrder: -2
+  m_Sprite: {fileID: -1806168786, guid: c35a0018a5a9a0a43882902ae09033a5, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &7509110568895175458
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6503119109324506896}
+  - component: {fileID: 4532292198235687560}
+  - component: {fileID: 1857277813970574203}
+  m_Layer: 9
+  m_Name: AimLine
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &6503119109324506896
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7509110568895175458}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4276721484070507378}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!120 &4532292198235687560
+LineRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7509110568895175458}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 6dae87f6dbe79e34fb7adcae048807dd, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Positions:
+  - {x: 0, y: 0, z: 0}
+  - {x: 6, y: 0, z: 1}
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.0031585693
+        value: 0.11028418
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    textureScale: {x: 1, y: 1}
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MaskInteraction: 0
+  m_UseWorldSpace: 1
+  m_Loop: 0
+  m_ApplyActiveColorSpace: 1
+--- !u!114 &1857277813970574203
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7509110568895175458}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0e85732096b0d414f9d6f9ea2e10f06f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lineRenderer: {fileID: 4532292198235687560}
+  density: 2
+  speed: 0.005
+  currentdisappearTime: 0
+  aimGamgObject: {fileID: 0}
+--- !u!1 &8899859137843901848
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 719232722191935980}
+  - component: {fileID: 5426754587987531663}
+  - component: {fileID: 8993153691267712734}
+  m_Layer: 9
+  m_Name: Square
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &719232722191935980
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8899859137843901848}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494}
+  m_LocalPosition: {x: 0.21, y: 0.675, z: 0.215}
+  m_LocalScale: {x: 0.13, y: 0.13, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6494013583369413442}
+  m_Father: {fileID: 4276721484070507378}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &5426754587987531663
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8899859137843901848}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -696370157
+  m_SortingLayer: 2
+  m_SortingOrder: -1
+  m_Sprite: {fileID: -1272889281, guid: 5b238b3b82e3f2847bc68e382cfc219e, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &8993153691267712734
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8899859137843901848}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _camera: {fileID: 0}
+  maxAnglesX: 0
+  minAnglesX: 0
+  maxAnglesY: 0
+  minAnglesY: 0
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/AcidRainCloud.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/AcidRainCloud.prefab.meta
@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: 5b07afdbcf13e43438545d591cfd2e4b
-DefaultImporter:
+guid: 8d141b903d19511449e7a3249b4e3b43
+PrefabImporter:
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/BoundSoul.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/BoundSoul.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0514ee1f043a1d64e99ffe7340605328
+guid: 279d9389205007c4f83c957211b36449
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Climavista.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Climavista.prefab
@ -0,0 +1,578 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &1253231568001379261
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4276721484070507378}
+  - component: {fileID: 7989887375954300062}
+  - component: {fileID: 230642570694684005}
+  - component: {fileID: 4358100366385517192}
+  - component: {fileID: -6455832433523655302}
+  m_Layer: 9
+  m_Name: Climavista
+  m_TagString: Enemy
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4276721484070507378
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  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:
+  - {fileID: 719232722191935980}
+  - {fileID: 8888823514061126702}
+  - {fileID: 6503119109324506896}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!135 &7989887375954300062
+SphereCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 0
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Radius: 0.48
+  m_Center: {x: 0, y: 0.3, z: 0}
+--- !u!114 &230642570694684005
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b93e606dce1c400408bd059eaaa399b2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  templateEnemyState: {fileID: 11400000, guid: 1abe4a11be3b9564db29e30f26b553f0, type: 2}
+  EnemyState: {fileID: 0}
+  positionX: 3
+  positionY: 5
+  pasth: []
+  oppositePasth: []
+  moveType: 0
+  enemy: {fileID: 0}
+  rangePool: []
+  aoeRangePool: []
+  stateText: 
+  jumpHeight: 1
+  posCount: 7
+  jumpSpeed: 25
+  speedCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0.00000032782555
+      value: 1.0011742
+      inSlope: -1.4465826
+      outSlope: -1.4465826
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0.7666647
+    - serializedVersion: 3
+      time: 0.49999422
+      value: 0.700547
+      inSlope: -0.011173545
+      outSlope: -0.011173545
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 1.0000062
+      value: 1.0063303
+      inSlope: 1.4297178
+      outSlope: 1.4297178
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0.36145905
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  enemyType: 0
+  enemyScript: 19
+  lineAim: {fileID: 7509110568895175458}
+  canLineAppre: 1
+  disableAttack: {fileID: 0}
+  enemyUIBar: {fileID: 0}
+  blockUIBar: {fileID: 0}
+  enemyUI: {fileID: 0}
+  followPoint: {fileID: 8888823514061126702}
+  bone: {fileID: 0}
+  bone_Re: {fileID: 0}
+  lasteHp: 0
+  anim: {fileID: 4358100366385517192}
+  meleeAttackSpeed: 4
+  meleeAttackSpeedCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  deathVfx: {fileID: 0}
+  deathParticle: {fileID: 0}
+  deathParticle_2: {fileID: 0}
+  canMove: 0
+  planAction: 0
+--- !u!95 &4358100366385517192
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: 68841ed7bed30c841bf31d58a61fa4e8, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!114 &-6455832433523655302
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1253231568001379261}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b46e9eb3a752a3e4eb4c052abe78f82a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  enemyNode: {fileID: 0}
+  aimNode: {fileID: 0}
+  layerMask:
+    serializedVersion: 2
+    m_Bits: 0
+  moveSpeed: 4
+--- !u!1 &2687402414900403258
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8888823514061126702}
+  m_Layer: 0
+  m_Name: FollowPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8888823514061126702
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2687402414900403258}
+  m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494}
+  m_LocalPosition: {x: 0, y: 0, z: -0.284}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4276721484070507378}
+  m_LocalEulerAnglesHint: {x: 59.43, y: 0.3, z: 0.1}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -0.253, y: 0.245}
+  m_SizeDelta: {x: 1.164, y: 0.6462}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7371518073400580404
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6494013583369413442}
+  - component: {fileID: 190055425036644223}
+  m_Layer: 9
+  m_Name: Floor
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6494013583369413442
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371518073400580404}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0.000000029802319, z: 0.000000029802319, w: 1}
+  m_LocalPosition: {x: -0.25873265, y: -3.6226575, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 719232722191935980}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &190055425036644223
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7371518073400580404}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -696370157
+  m_SortingLayer: 2
+  m_SortingOrder: -2
+  m_Sprite: {fileID: -1806168786, guid: c35a0018a5a9a0a43882902ae09033a5, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!1 &7509110568895175458
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6503119109324506896}
+  - component: {fileID: 4532292198235687560}
+  - component: {fileID: 1857277813970574203}
+  m_Layer: 9
+  m_Name: AimLine
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &6503119109324506896
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7509110568895175458}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4276721484070507378}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!120 &4532292198235687560
+LineRenderer:
+  serializedVersion: 2
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7509110568895175458}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 6dae87f6dbe79e34fb7adcae048807dd, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Positions:
+  - {x: 0, y: 0, z: 0}
+  - {x: 6, y: 0, z: 1}
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0.0031585693
+        value: 0.11028418
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 1, g: 1, b: 1, a: 1}
+      key1: {r: 1, g: 1, b: 1, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_ColorSpace: -1
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 0
+    alignment: 0
+    textureMode: 0
+    textureScale: {x: 1, y: 1}
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_MaskInteraction: 0
+  m_UseWorldSpace: 1
+  m_Loop: 0
+  m_ApplyActiveColorSpace: 1
+--- !u!114 &1857277813970574203
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7509110568895175458}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0e85732096b0d414f9d6f9ea2e10f06f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  lineRenderer: {fileID: 4532292198235687560}
+  density: 2
+  speed: 0.005
+  currentdisappearTime: 0
+  aimGamgObject: {fileID: 0}
+--- !u!1 &8899859137843901848
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 719232722191935980}
+  - component: {fileID: 5426754587987531663}
+  - component: {fileID: 8993153691267712734}
+  m_Layer: 9
+  m_Name: Square
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &719232722191935980
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8899859137843901848}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.41586685, y: 0.3218321, z: -0.16021955, w: 0.8353494}
+  m_LocalPosition: {x: 0.21, y: 0.675, z: 0.215}
+  m_LocalScale: {x: 0.13, y: 0.13, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 6494013583369413442}
+  m_Father: {fileID: 4276721484070507378}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &5426754587987531663
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8899859137843901848}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: -696370157
+  m_SortingLayer: 2
+  m_SortingOrder: -1
+  m_Sprite: {fileID: -1272889281, guid: 5b238b3b82e3f2847bc68e382cfc219e, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 1, y: 1}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!114 &8993153691267712734
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8899859137843901848}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f71de549a026fec48b8f116e81d3ff61, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _camera: {fileID: 0}
+  maxAnglesX: 0
+  minAnglesX: 0
+  maxAnglesY: 0
+  minAnglesY: 0
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Climavista.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Climavista.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 24ec699fbe456d94e861d3236b787e99
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/ContaminatusImmortalis.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/ContaminatusImmortalis.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 15
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/ContaminatusImmortalis.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/ContaminatusImmortalis.prefab.meta
@ -1,11 +1,6 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:ColorlessWorld-2024-4-2/Assets/Cartoon FX Pack/Demo/Demo.unity.meta
-guid: 7e6316eb347b3c844bf10a1eddfdfe43
-DefaultImporter:
-========
-guid: b1a9861072b29ff4b986818e1a6e3b07
+guid: 9d4b9b91d90a39a4ab413930d2ca580f
 PrefabImporter:
->>>>>>>> origin/dev-1217:ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/ContaminatusImmortalis.prefab.meta
  externalObjects: {}
  userData: 
  assetBundleName: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/FailedSample.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/FailedSample.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 5530738b583125c489ff80d90c8b60d0
+guid: 49641935fdc09c548a36f937cd5858cd
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Gravitus.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Gravitus.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 12
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Gravitus.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Gravitus.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 12ead37dfb7213f4d9cd1b104a774c68
+guid: 8ec70d2cd7dd62241829a45bcf5feae1
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Leviathan.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Leviathan.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 28b49ac127a5c524c8d3669aa2ea68a8
+guid: 4eb495cdee82d8f419a79c0d8235088a
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/LivingArmor.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/LivingArmor.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4dd87c495323edf45873209c6a413421
+guid: 32690402071c9b4438c067a8322850b7
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Pharmacist.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Pharmacist.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 3d1dcb1cb9d9254418b8267eedfde656
+guid: a3234acb1bf506e4ba6a68d9c87bb537
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Pollutinel.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Pollutinel.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 14
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Pollutinel.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Pollutinel.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 164bb34e52400ef4ca9b83d1954e72be
+guid: cd4624f469926f94e8f47934573c4934
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/PollutionSpreader.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/PollutionSpreader.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 11
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/PollutionSpreader.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/PollutionSpreader.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 48ea228c01b68f24b895e2f539c1ea38
+guid: e36b402b281e045408911f00a5fd577e
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/PrismReflector.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/PrismReflector.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 10
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/PrismReflector.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/PrismReflector.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f97d39a0a1bb8bb4bbca36ef6adfc445
+guid: 605a93e2d6a242f4e98c34372d58ccc0
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/RatWarrior.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/RatWarrior.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7dd8201c9985b7c49986fe8d9657bd57
+guid: 8300182e5224b8a4193edb7a4d71bd45
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/ReconnaissanceBee.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/ReconnaissanceBee.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 9
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/ReconnaissanceBee.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/ReconnaissanceBee.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e23cfb87d5c44b04f9ad4d686b577f53
+guid: 31a0131324aed174c981c8e811a11fd1
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/SoulMaker.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/SoulMaker.prefab
@ -181,7 +181,7 @@ MonoBehaviour:
  layerMask:
    serializedVersion: 2
    m_Bits: 0
-  moveSpeed: 0
+  moveSpeed: 4
  isSpeedUp: 0
  enemyList:
  - BoundSoul
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/SoulMaker.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/SoulMaker.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 245fcfab7463f1d448daed0b7ceecc3e
+guid: cca022349b339cb478907d317369caed
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/StonePillar.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/StonePillar.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 17
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/StonePillar.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/StonePillar.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 11a8f0d2494cd4242b45c56fd7a75535
+guid: 1eb98ea77ae780a47b9adb39bce1a5af
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Thief.prefab
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Thief.prefab
@ -119,7 +119,7 @@ MonoBehaviour:
    m_PostInfinity: 2
    m_RotationOrder: 4
  enemyType: 0
-  enemyScript: 0
+  enemyScript: 13
  lineAim: {fileID: 7509110568895175458}
  canLineAppre: 1
  disableAttack: {fileID: 0}
@ -203,6 +203,9 @@ MonoBehaviour:
    serializedVersion: 2
    m_Bits: 0
  moveSpeed: 4
+  aliveCount: 0
+  stolenForgingPointCount: 0
+  stolenMoney: 0
 --- !u!1 &2687402414900403258
 GameObject:
  m_ObjectHideFlags: 0
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Thief.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Thief.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1fedcb47b1ce35d49b213013ed1173fa
+guid: e522f0447cdcaec47bf331fd755f7209
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Twinbee.prefab.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Resources/EnemyPrefab/Twinbee.prefab.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: acbc4ffefa094614e9469b176d05c706
+guid: ccd122008590ac34bb1121ad8f613b76
 PrefabImporter:
  externalObjects: {}
  userData: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_HalfDamageInBlack.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_HalfDamageInBlack.cs
@ -0,0 +1,29 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_HalfDamageInBlack : Buff
+{
+    public override void Settle()
+    {
+        //base.Settle();
+    }
+
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        //base.Settle();
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_HalfDamageInBlack();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "fireseed");
+        return buff;
+    }
+}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_HalfDamageInBlack.cs.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_HalfDamageInBlack.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2bf875328989d1d419e2d3c4da5c813e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextDrawCardisDisposable.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextDrawCardisDisposable.cs
@ -0,0 +1,21 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_NextDrawCardisDisposable : Buff
+{
+    public override void Settle()
+    {
+        //value = 0;
+
+    }
+
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_NextDrawCardisDisposable();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextDrawCardisDisposable.cs.meta
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_NextDrawCardisDisposable.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: cec1bdc344838ea4ea410a9766bfc028
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardDrag.cs
@ -323,11 +323,9 @@ public class CardDrag : MonoBehaviour, IBeginDragHandler, IDragHandler, IEndDrag

    private void energyCostCheck()
    {
-        int trueCost = cardEntity.currentCost;
-        if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Black))
-        {
-            trueCost++;
-        }
+        int trueCost;
+        string trueCostType = Name.CostType.energy;
+        (trueCost, trueCostType) = CardResourcesManager.Instance.getCardCost(cardEntity.cardOriginalData);
        if (GameManager.Instance.playerState.currentCost - trueCost < 0)
        {
            Debug.Log("能量费用不足");
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/CardEntity.cs
@ -104,7 +104,7 @@ public class CardEntity : MonoBehaviour
    int lastCost;
    public int currentCost;
    public string currentCostType;
-    public bool tempIsDisposable=true;
+    public bool tempIsDisposable=false;
    private void Start()
    {
        currentCost = cardOriginalData.Cost;
@ -121,6 +121,7 @@ public class CardEntity : MonoBehaviour
    {
        checkAndUpdateCondition();
        createCardCost();
+        createCardDescription();
        //CardResourcesManager.getFunAndValForSwage(cardOriginalData.Cost, CardFunction.cardDamage);
        //createCastRange();
    }
@ -1054,7 +1055,7 @@ public class CardEntity : MonoBehaviour


        Name.CreateCardDescription(sb, cardOriginalData,this);
-        Debug.Log("卡牌"+cardOriginalData.CardId+"描述是:" + sb);
+        //Debug.Log("卡牌"+cardOriginalData.CardId+"描述是:" + sb);
        cardDescription.text = sb.ToString();
       // cardDescription.text= Replace( sb.ToString());
    }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Card/TurnMaster.cs
@ -658,6 +658,15 @@ public class TurnMaster : Singleton<TurnMaster>
        cardEntity.createCard(cardDeck.cardList[cardDeck.cardList.Count - 1], i,true);
        cardDeck.cardList.RemoveAt(cardDeck.cardList.Count - 1);
        handCard.cardEntityList.Add(cardEntity);
+        if (Usermanager.playerAbnormalCondition.ContainsKey(AbnormalCondition.nextDrawCardisDisposable))
+        {
+            cardEntity.tempIsDisposable = true;
+            Usermanager.playerAbnormalCondition[AbnormalCondition.nextDrawCardisDisposable].value -= 1;
+            if (Usermanager.playerAbnormalCondition[AbnormalCondition.nextDrawCardisDisposable].value <= 0)
+            {
+                Usermanager.playerAbnormalCondition.Remove(AbnormalCondition.nextDrawCardisDisposable);
+            }
+        }
        //添加卡牌移动脚本
        CardSmall cardSmall = cardPrefab.AddComponent<CardSmall>();
        cardSmall.SetDestinationWithDrawCard(CardActiveSort.Instance.newPointList[i]);
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/AcidRainCloud.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/AcidRainCloud.cs
@ -55,7 +55,8 @@ public class AcidRainCloud : Enemy
                // enemyNode.anim.SetTrigger("MeleeAttack");
                // yield return new WaitForSeconds(0.5f);
                AttackDamage(enemyNode.EnemyState.damage, 1);
-                RandomTurnHandCardTempIsDisposable(1);
+                Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.nextDrawCardisDisposable, 1);
+                //RandomTurnHandCardTempIsDisposable(1);
            }
        }
        else
@ -71,7 +72,8 @@ public class AcidRainCloud : Enemy
                    // enemyNode.anim.SetTrigger("MeleeAttack");
                    //  yield return new WaitForSeconds(0.5f);
                    AttackDamage(enemyNode.EnemyState.damage, 1);
-                    RandomTurnHandCardTempIsDisposable(1);
+                    Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.nextDrawCardisDisposable, 1);
+                    //RandomTurnHandCardTempIsDisposable(1);
                }
            }
        }
@ -82,7 +84,7 @@ public class AcidRainCloud : Enemy
        HashSet < CardEntity > targetSet= MathTool.GetRandomElements(new HashSet<CardEntity>(TurnMaster.Instance.handCard.cardEntityList), num);
        foreach(CardEntity cardEntity in targetSet)
        {
-            cardEntity.tempIsDisposable = false;
+            cardEntity.tempIsDisposable = true;
        }
    }
    public IEnumerator ThrowAttackAction(int count)
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Climavista.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Climavista.cs
@ -14,6 +14,8 @@ public class Climavista : Enemy
    {
        actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shield), 0.7f);
        actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.random), 0.3f);
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.halfDamageInBlack, 1);
    }

    private void Update()
@ -62,7 +64,7 @@ public class Climavista : Enemy
        HashSet < CardEntity > targetSet= MathTool.GetRandomElements(new HashSet<CardEntity>(TurnMaster.Instance.handCard.cardEntityList), num);
        foreach(CardEntity cardEntity in targetSet)
        {
-            cardEntity.tempIsDisposable = false;
+            cardEntity.tempIsDisposable = true;
        }
    }
    public IEnumerator SummonAction()
@ -73,24 +75,44 @@ public class Climavista : Enemy
        getNodeTools.getCircleNode(set, 1);
        HashSet<MapUnity> targetSet = MathTool.GetRandomElements(set,1);
        MapUnity enemyMapunity=targetSet.ElementAt(0);
+        EnemyNode targetEnemy=new EnemyNode();
        for (int i = 0; i < EnemyManager.Instance.enemySpeedSortingList.Count; i++)
        {
            if (EnemyManager.Instance.enemySpeedSortingList[i].enemyScript==EnemyNode.EnemyScript.AcidRainCloud)
            {
                target = EnemyManager.Instance.enemySpeedSortingList[i].GetComponent<GameObject>();
+                targetEnemy=EnemyManager.Instance.enemySpeedSortingList[i];
            }
        }
        if (target == null||enemyMapunity==null)
        {
            yield return null;
        }
-        var currentenemy = Instantiate(target, this.transform.position, this.transform.rotation);
+        List<GameObject> enemyPrefabList = EnemyPool.getEnemyPrefab(new List<string> { Name.EnemyName.AcidRainCloud });
+        HashSet<MapUnity> allCanUseNode = getNodeTools.getAllCanUseNode();
+        if (enemyPrefabList.Count > 0)
+        {
+            foreach (var enemyPrefab in enemyPrefabList)
+            {
+                MapUnity currentMapUnity = allCanUseNode.ElementAt(UnityEngine.Random.Range(0, allCanUseNode.Count));
+                var currentEnemy = Instantiate(enemyPrefab, currentMapUnity.transform.position, enemyPrefab.transform.rotation);
+                EnemyNode enemynode = currentEnemy.GetComponent<EnemyNode>();
+                enemynode.positionX = currentMapUnity.locationX;
+                enemynode.positionY = currentMapUnity.locationY;
+                enemynode.StartPosition();
+                enemynode.EnemyState.copy(targetEnemy.EnemyState);
+                //enemynode.EnemyState == targetEnemy.EnemyState;
+                allCanUseNode.Remove(currentMapUnity);
+                yield return new WaitForSeconds(0.5f);
+            }
+        }
+        /*var currentenemy = Instantiate(target, this.transform.position, this.transform.rotation);
        EnemyNode newEnemyNode = currentenemy.GetComponent<EnemyNode>();
        newEnemyNode.positionX = enemyMapunity.locationX;
        newEnemyNode.positionY = enemyMapunity.locationY;
        MapUnity newNode = getNodeTools.LocationToGetNode(newEnemyNode.positionX, newEnemyNode.positionY);
-        newNode.enemyNode = newEnemyNode;
-        yield return null;
+        newNode.enemyNode = newEnemyNode;*/
+        yield return new WaitForSeconds(0.5f);
    }


--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyManager.cs
@ -112,7 +112,7 @@ public class EnemyManager : Singleton<EnemyManager>

    public void EnemyTurn_Observer()
    {
-        SpeedSortList();
+        //SpeedSortList();
        enemyCount = 0;
        enemyTurnState = EnemyTurnState.stop;
        EnemySortIconDelete();
@ -224,6 +224,7 @@ public class EnemyManager : Singleton<EnemyManager>

    public void enemyTurnBeginSettle(int settleTurn)
    {
+        SpeedSortList();
        foreach (var observer in enemyObservers)
        {
            //observer.GetEnemyNode().enemyTurnSettleInit();
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs
@ -324,6 +324,11 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
                enemy = twinbee;
                enemy.enemyNode = this;
                break;
+            case EnemyScript.ReconnaissanceBee:
+                ReconnaissanceBee reconnaissanceBee = GetComponent<ReconnaissanceBee>();
+                enemy = reconnaissanceBee;
+                enemy.enemyNode = this;
+                break;
            case EnemyScript.PrismReflector:
                PrismReflector prismReflector = GetComponent<PrismReflector>();
                enemy = prismReflector;
@ -364,6 +369,16 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
                enemy = stonePillar;
                enemy.enemyNode = this;
                break;
+            case EnemyScript.AcidRainCloud:
+                AcidRainCloud acidRainCloud = GetComponent<AcidRainCloud>();
+                enemy = acidRainCloud;
+                enemy.enemyNode = this;
+                break;
+            case EnemyScript.Climavista:
+                Climavista climavista = GetComponent<Climavista>();
+                enemy = climavista;
+                enemy.enemyNode = this;
+                break;
        }
        enemy.ChooseAction();
        enemy.ChooseAimNode();
@ -800,8 +815,8 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
    public virtual void OnDeath()
    {
        DeathVfxCal();
-        enemyReward();
-        //enemy.OnDeath();dev-1217±£Áô
+        //enemyReward();
+        enemy.OnDeath();

        if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.boomAndPollute))
        {
@ -885,11 +900,20 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
    {
        if (enemyScript == EnemyScript.Pharmacist)
        {
-
+            RewardManager.Instance.AddRewardTips(RewardManager.RewardType.potion,1.ToString());
        }
        if (enemyScript == EnemyScript.Thief)
        {
-
+            Thief thief = (Thief)enemy;
+            if (thief.stolenMoney != 0)
+            {
+                RewardManager.Instance.AddRewardTips(RewardManager.RewardType.money, thief.stolenMoney.ToString());
+            }
+            if (thief.stolenForgingPointCount != 0)
+            {
+                RewardManager.Instance.AddRewardTips(RewardManager.RewardType.forgPoint, thief.stolenForgingPointCount.ToString());
+            }
+            
        }
    }
    //ËÀÍöÌØÐ§
@ -1531,7 +1555,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver

    public void enemyTurnSettle(int settleTurn)
    {
-        enemy.enemyTurnEnd();
+        //enemy.enemyTurnEnd();
        foreach (var key in EnemyState.abnormalCondition.Keys.ToList())
        {
            EnemyState.abnormalCondition[key].SettleEnemy(this);
@ -1658,6 +1682,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
            EnemyState. sufferDamageMultiply = 1f;
        }
        float stoneSkinMultiply = 1f;
+        
        if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.stoneSkin))
        {

@ -1665,7 +1690,13 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver

            stoneSkinMultiply -= 0.2f * count;
        }
-        damage = (int)(EnemyState.sufferDamageMultiply * damage* stoneSkinMultiply);
+        float halfDamageInBlackMultiply = 1f;
+        MapUnity currentNode = GameManager.Instance.X[positionX].Y[positionY];
+        if (EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.halfDamageInBlack)&&Name.NodeColor.EnemyColor.Contains(currentNode.whoColour))
+        {
+            stoneSkinMultiply = 0.5f;
+        }
+        damage = (int)(EnemyState.sufferDamageMultiply * damage* stoneSkinMultiply* halfDamageInBlackMultiply);
        return damage;
    }

--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Leviathan.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Leviathan.cs
@ -16,7 +16,7 @@ public class Leviathan : Enemy
        actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.spellAndAttack), 0.3f);
        actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.spell), 0.4f);
        enemyNode.sufferAbnormalCondition(AbnormalCondition.stoneSkin, 4);
-        enemyNode.sufferAbnormalCondition(AbnormalCondition.shedding, 6);
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.shedding, 7);
    }
    public override void SettlePlannText(EnemyAction currentAction)
    {
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pharmacist.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pharmacist.cs
@ -44,10 +44,13 @@ public class Pharmacist : Enemy
                //改变文本
                enemyNode.currentActionScript.SettleText(enemyNode, "8", "使生命最低的单位获得8点护盾，并将其周围7格变为污染");
                break;
-
        }

    }
+    public override void OnDeath()
+    {
+        RewardManager.Instance.AddRewardTips(RewardManager.RewardType.potion, 1.ToString());
+    }
    public override void ChooseAction()
    {
        aimMapunity = GameManager.Instance.playerOn;
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pollutinel.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Pollutinel.cs
@ -127,12 +127,9 @@ public class Pollutinel : Enemy
            yield return StartCoroutine(moveTowardsPlayer());
            yield return new WaitForSeconds(1);
            currentNode = getNodeTools.LocationToGetNode(enemyNode.positionX, enemyNode.positionY);
-            if (getNodeTools.canRemoteAttack(currentNode, enemyNode.EnemyState.attackRange))
-            {
-                enemyNode.anim.SetTrigger("Action");
-                yield return new WaitForSeconds(0.5f);
-                isSurveillance = true;
-            }
+            enemyNode.anim.SetTrigger("Action");
+            yield return new WaitForSeconds(0.5f);
+            isSurveillance = true;
        }
    }

--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/PrismReflector.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/PrismReflector.cs
@ -59,6 +59,7 @@ public class PrismReflector : Enemy
        MapUnity currentNode = getNodeTools.LocationToGetNode(enemyNode.positionX, enemyNode.positionY);
        if (Name.NodeColor.PlayerColor.Contains(currentNode.whoColour))
        {
+            Debug.Log("whoColour是" + currentNode.whoColour);
            AttackDamage(getNodeTools.getNodesCount(Name.intColorTostring(currentNode.whoColour)),1);
        }
    }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Thief.cs
@ -2,28 +2,41 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Unity.VisualScripting;
 using UnityEngine;

 public class Thief : Enemy
 {

-    int aliveCount = 0;
-    int stealForgingPointCount= 0;
-    int stealMoney = 0;
+    public int aliveCount = 0;
+    public int stolenForgingPointCount = 0;
+    public int stolenMoney = 0;

    private void Start()
    {
        actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 0.7f);
-        actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shoot), 0.3f);
+        actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shootAndPollute), 0.3f);
        //actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.sleep), 0.4f);
    }

    public override void enemyTurnEnd()
    {
        aliveCount++;
-        if(aliveCount == 4)
+        /*if(aliveCount == 4)
        {
-            enemyNode.OnDeath();
+            enemyNode.RunAway();
+        }*/
+    }
+
+    public override void OnDeath()
+    {
+        if (stolenMoney != 0)
+        {
+            RewardManager.Instance.AddRewardTips(RewardManager.RewardType.money, stolenMoney.ToString());
+        }
+        if (stolenForgingPointCount != 0)
+        {
+            RewardManager.Instance.AddRewardTips(RewardManager.RewardType.forgPoint, stolenForgingPointCount.ToString());
        }
    }

@ -42,7 +55,7 @@ public class Thief : Enemy
            case EnemyActionAction_Attack:
                yield return StartCoroutine(MeleeAttackAction());
                break;
-            case EnemyActionAction_Shoot:
+            case EnemyAction_ShootAndPollute:
                yield return StartCoroutine(TeleportAction(enemyNode.EnemyState.damage,1,20));
                break;
        }
@ -64,7 +77,7 @@ public class Thief : Enemy
                AttackDamage(enemyNode.EnemyState.damage, 1);
                if (currentNode.whoColour == Name.NodeColor.Black)
                {
-                    stealForgingPointCount+=stealForgingPoint(4);
+                    stolenForgingPointCount += stealForgingPoint(4);
                }
            }
        }
@ -83,7 +96,7 @@ public class Thief : Enemy
                    AttackDamage(enemyNode.EnemyState.damage, 1);
                    if (currentNode.whoColour == Name.NodeColor.Black)
                    {
-                        stealForgingPointCount += stealForgingPoint(4);
+                        stolenForgingPointCount += stealForgingPoint(4);
                    }
                }
            }
@ -96,9 +109,9 @@ public class Thief : Enemy
        HashSet<MapUnity> targets = new HashSet<MapUnity> { GameManager.Instance.playerOn };
        getNodeTools.getCircleNode(targets, 1);
        HashSet<MapUnity> targetNode = MathTool.GetRandomElements(targets, 1);
-        moveOneStep(targetNode.ElementAt(0));
+        yield return StartCoroutine(moveOneStep(targetNode.ElementAt(0)));
        AttackDamage(damage, damageCount);
-        stealMoney += stealMoney(15);
+        stolenMoney += stealMoney(15);
        yield return null;
    }

--- a/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/MapManager.cs
@ -294,7 +294,7 @@ public class MapManager : Singleton<MapManager>
        List<GameObject> enemyPrefabList = EnemyPool.getEnemyPrefab(enemyList);

        HashSet<MapUnity> allCanUseNode = getNodeTools.getAllCanUseNode();
-        if(enemyPrefabList.Count >0)
+        if (enemyPrefabList.Count > 0)
        {
            foreach (var enemyPrefab in enemyPrefabList)
            {
@ -308,7 +308,7 @@ public class MapManager : Singleton<MapManager>
                yield return null;
            }
        }
-       
+

        yield return null;
    }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Player.cs
@ -266,7 +266,7 @@ public class Player : MonoBehaviour
                    GameManager.Instance.playerState.currentStepRange -= 1;
                    LegacyManager.Instance.tryUseLegacy(Name.Legacy.LegacyNode_PlatedSteelcaps);
                }
-                SurveillanceCheck(mapNode);
+                
                this.gameObject.transform.position = new Vector3(mapNode.transform.position.x, 0.5f, mapNode.transform.position.z);
                mapNode.playerOn = true;
                GameManager.Instance.playerOn = mapNode;
@ -274,7 +274,7 @@ public class Player : MonoBehaviour

               //¸Ä±ä¶¯»
               anim.SetBool("move", false);
-
+                SurveillanceCheck(mapNode);
                //È¡Ïû±ê¼ÇÖÕµã
                mapNode.markInfluenced = false;
                TurnMaster.Instance.playerAction = TurnMaster.PlayerAction.none;
@ -304,10 +304,12 @@ public class Player : MonoBehaviour
            {
                Pollutinel pollutinel = (Pollutinel)EnemyManager.Instance.enemySpeedSortingList[i].enemy;
                HashSet<MapUnity> targetSet = new HashSet<MapUnity> { mapNode };
-                getNodeTools.getCircleNodeForEnemy(targetSet, 2);
+                getNodeTools.getCircleNodeForBoom(targetSet, 2);
                MapUnity currentNode = getNodeTools.LocationToGetNode(pollutinel.enemyNode.positionX, pollutinel.enemyNode.positionY);
+                //MapUnity currentNode = getNodeTools.LocationToGetNode(EnemyManager.Instance.enemySpeedSortingList[i].positionX, EnemyManager.Instance.enemySpeedSortingList[i].positionY);
                if (pollutinel.isSurveillance == true && targetSet.Contains(currentNode))
                {
+                    Debug.Log("isSurveillance³É¹¦");
                    Usermanager.Instance.SufferTrueDamage(pollutinel.enemyNode.EnemyState.damage);
                    pollutinel.isSurveillance = false;
                }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Relic/LegacyManager.cs
@ -24,12 +24,43 @@ public class LegacyManager : Singleton <LegacyManager>
    ;

    public HashSet<string> commonRelicsSet = new HashSet<string>
+    {
+        Name .Legacy .LegacyNode_WasteReconstructor,
+        Name .Legacy .LegacyNode_PlatedSteelcaps,
+        Name .Legacy .LegacyNode_ActivatedCarbon,
+        Name .Legacy .LegacyNode_ChaosTrigger,
+        Name .Legacy .LegacyNode_Filter
+    };
+
+    public HashSet<string> rareRelicsSet = new HashSet<string>
+    {
+        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
+    };
+
+    public HashSet<string> legendaryRelicsSet = new HashSet<string>
    {
        Name .Legacy .LegacyNode_BloodBorne,
+        Name .Legacy .LegacyNode_AegisOfTheImmortal,
+        Name .Legacy .LegacyNode_SpeedLoader,
+        Name .Legacy .LegacyNode_MeatSaw,
+        Name .Legacy .LegacyNode_Prism
+    };
+
+    public HashSet<string> bossRelicsSet = new HashSet<string>
+    {
        Name .Legacy .LegacyNode_BloodTax,
-        Name .Legacy .LegacyNode_Parasol
+        Name .Legacy .LegacyNode_Sneakers,
+        Name .Legacy .LegacyNode_PerpetualMotionPump
+
    };
- 

    [Header("从玩家数据读过来的遗物类名表")]
    public List<string> relicClassNameList = new List<string>();
@ -127,6 +158,37 @@ public class LegacyManager : Singleton <LegacyManager>
        return MathTool.GetRandomElements(trueSet, count);
    }

+    public HashSet<string> getRandomRelic(int count,int rarity)
+    {
+        HashSet<string> trueSet = new HashSet<string>();
+        switch (rarity)
+        {
+            case Name.LegecyRarity.Common:
+                trueSet = new HashSet<string>(commonRelicsSet);
+                break;
+            case Name.LegecyRarity.Rare:
+                trueSet = new HashSet<string>(rareRelicsSet);
+                break;
+            case Name.LegecyRarity.Legendary:
+                trueSet = new HashSet<string>(legendaryRelicsSet);
+                break;
+            case Name.LegecyRarity.Boss:
+                trueSet = new HashSet<string>(bossRelicsSet);
+                break;
+            case Name.LegecyRarity.Shop:
+                trueSet = new HashSet<string>(shopRelicsSet);
+                break;
+        }
+        foreach (string relic in relicClassNameList)
+        {
+            if (trueSet.Contains(relic))
+            {
+                trueSet.Remove(relic);
+            }
+        }
+        return MathTool.GetRandomElements(trueSet, count);
+    }
+
    public void ShowLegacyClassAsOwned()
    {
        if(legacyFather != null )
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/AbnormalCondition.cs
@ -113,6 +113,10 @@ public class AbnormalCondition : Singleton<AbnormalCondition>
    public const string stoneSkin = "97";
    //ËáÓê
    public const string acidRain = "98";
+    //抽到的下一张牌消耗
+    public const string nextDrawCardisDisposable = "99";
+    //在污染地块上半伤
+    public const string halfDamageInBlack = "100";

    public static readonly List<string> canNegativeNumberList = new List<string> { angerUpperDamage, shieldUpperValue, addDrawCard };

--- 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
@ -1,6 +1,10 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using UnityEngine;
+using static Unity.VisualScripting.Member;

 [CreateAssetMenu(fileName = "New State", menuName = "PlayerState/EnemyState")]
 public class EnemyState_SO : ScriptableObject
@ -44,4 +48,27 @@ public class EnemyState_SO : ScriptableObject

    public int maxNumberOfHits;//受击次数
    public int currentNumberOfHits;
+
+    public int polluteNodeNum;
+
+    public void copy(EnemyState_SO source)
+    {
+        if (source == null)
+            throw new ArgumentNullException(nameof(source));
+
+        PropertyInfo[] properties = source.GetType().GetProperties()
+            .Where(p => p.CanRead && p.CanWrite)
+            .ToArray();
+
+        foreach (PropertyInfo prop in properties)
+        {
+            object value = prop.GetValue(source);
+            prop.SetValue(this, value);
+        }
+        abnormalCondition= new Dictionary<string, Buff>(source.abnormalCondition);
+    }
+
+    public EnemyState_SO()
+    {
+    }
 }
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Tool/Name.cs
@ -109,6 +109,7 @@ public static class Name
        public const int CurrentCost = 9;
        public const int Potion = 10;
    }
+
    public static void CreateCardDescription(StringBuilder sb,CardOriginalData cardOriginalData,CardEntity cardEntity)
    {
        bool isFirst = true;
@ -128,7 +129,7 @@ public static class Name
            }
            getSingleDescription(sb, kvp);
        }
-        if(!cardEntity.tempIsDisposable||!cardOriginalData
+        if (cardEntity.tempIsDisposable||cardOriginalData
            .IsDisposable)
        {
            sb.Append(",ÏûºÄ");
@ -502,6 +503,16 @@ public static class Name

    }

+    public static class LegecyRarity
+    {
+        public const int Common = 1;
+        public const int Rare = 2;
+        public const int Legendary = 3;
+        public const int Boss = 4;
+        public const int Shop = 5;
+
+    }
+
    public static class CardElement
    {
        public const string redCount = "red";
@ -531,7 +542,7 @@ public static class Name
        public const int Black = 5;
        public const int Metal = 6;
        public const int Yellow = 7;
-        public static readonly List<int> PlayerColor = new() { Red, Blue, Yellow };
+        public static readonly List<int> PlayerColor = new() { Red, Blue, Yellow , Green };
        public static readonly List<int> EnemyColor = new() { Black };
    }

--- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs
@ -59,7 +59,8 @@ public class BuffDataManager : Singleton<BuffDataManager>
        abnormalCondition.Add("96", new Buff_Invisible());
        abnormalCondition.Add("97", new Buff_StoneSkin());
        abnormalCondition.Add("98", new Buff_AcidRain());
-
+        abnormalCondition.Add("99", new Buff_NextDrawCardisDisposable());
+        abnormalCondition.Add("100", new Buff_HalfDamageInBlack());

        abnormalCondition.Add("106", new Buff_flashPoint());
        abnormalCondition.Add("107", new Buff_BonePile());
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/MapUnityManager.cs
@ -95,6 +95,7 @@ public class MapUnityManager : Singleton<MapUnityManager>
        bool isMatch = false;
        if (GameManager.Instance.playerOn.whoColour == color)
        {
+            //Debug.Log("whoColour是是" + GameManager.Instance.playerOn.whoColour);
            isMatch = true;
        }
        return isMatch;
--- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs
+++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs
@ -601,11 +601,15 @@ public class Usermanager : Singleton<Usermanager>

        if (playerAbnormalCondition.ContainsKey(AbnormalCondition.upSpeed))
        {
-            addStepRange = 1;
+            addStepRange += 1;
        }
        else if (playerAbnormalCondition.ContainsKey(AbnormalCondition.downSpeed))
        {
-            addStepRange = -1;
+            addStepRange -=1;
+        }
+        else if (playerAbnormalCondition.ContainsKey(AbnormalCondition.disable))
+        {
+            addStepRange -=1;
        }
        if (playerAbnormalCondition.ContainsKey(AbnormalCondition.banStep))
        {
--- 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,7 +10,7 @@
 2009,1,0,11;93,1;1,none,none,none,none,0_0,CardIcon/1010,0,1,1,玫瑰茶,none
 2012,1,1,40;93,-1;2,none,none,none,none,0_0,CardIcon/1010,0,1,0,冷静,none
 2014,1,1,57,4,blue>9,57,2,none,0_0,CardIcon/1010,0,2,0,割裂,none
-2015,1,2,1,15,yellow>4,53,5-3,1,0_0,CardIcon/1010,1,3,0,左右开弓,none
+2015,1,2,1,100,yellow>4,53,5-3,1,0_0,CardIcon/1010,1,3,0,左右开弓,none
 2016,1,1,82,1,none,none,none,none,0_0,CardIcon/1010,0,3,1,消失,none
 2017,1,1,83,3,yellow>4,93,1,none,0_0,CardIcon/1010,1,3,0,死亡印记,none
 2018,1,1,84;85,1;1,yellow>5,33,1,none,0_0,CardIcon/1010,1,2,0,暗影步,none
--- a/Materials/OutLineSourceHanSansCN-Normal
+++ b/Materials/OutLineSourceHanSansCN-Normal
--- a/ColorlessWorld-2024-4-2/Assets/TextMesh
+++ b/ColorlessWorld-2024-4-2/Assets/TextMesh