Merge pull request 'bug修复' (#96) from dev-0325-yjm into dev-1217

Reviewed-on: #96

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/Pharmacist.prefab

@@ -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

ColorlessWorld-2024-4-2/Assets/Prefab/EnemyPrefab/PollutionSpreader.prefab

@@ -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

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

@@ -48862,7 +48862,15 @@ MonoBehaviour:
   generatePoint: {fileID: 514899946}
   lineOffSet: {x: 1.43, y: 0, z: 0}
   columnOffSet: {x: 0, y: 0, z: 0.86}
-  enemyGenerateDataList: []
+  enemyGenerateDataList:
+  - enemyPrefab: {fileID: 1253231568001379261, guid: 589ff9c9fe779f141b239dcae72b5b67,
+      type: 3}
+    locationX: 3
+    locationY: 3
+  - enemyPrefab: {fileID: 1253231568001379261, guid: 58d538ffd37498c4b945bf5571921770,
+      type: 3}
+    locationX: 4
+    locationY: 3
   mapUnityFather: {fileID: 471426433}
   playerNameText: {fileID: 742474145}
   playerMoneyText: {fileID: 506890230}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoundSoul.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_BoundSoul : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_BoundSoul();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_BoundSoul.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 699e5ab009adaff4d9622e88cb781cd2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ContaminatusImmortalis.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_ContaminatusImmortalis : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_ContaminatusImmortalis();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ContaminatusImmortalis.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 16a5367070b10c240965f80253bc3f00
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FailedSample.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_FailedSample : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_FailedSample();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_FailedSample.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4d8ac020bc0a36e459450f0c61685c78
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_LivingArmor.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_LivingArmor : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_LivingArmor();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_LivingArmor.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 99878e052cc44fc4da93e5932c2455e5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Pharmacist.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_Pharmacist : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_Pharmacist();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Pharmacist.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: c920a488f0f3aab4597ab0a3be0810b2
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PollutionSpreader.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_PollutionSpreader : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_PollutionSpreader();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PollutionSpreader.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d4268d7b937508041aa5f03d14dc875c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PrismReflector.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_PrismReflector : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_PrismReflector();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_PrismReflector.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: fb02617f23cd6ad4cae6ab288a0d570d
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_RatWarrior.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_RatWarrior : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_RatWarrior();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_RatWarrior.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 90e3daf277e17fc42875d1d3d60a1052
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ReconnaissanceBee.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_ReconnaissanceBee : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_ReconnaissanceBee();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_ReconnaissanceBee.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0383c01ebcd18a64a97df562d2d70780
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_SoulMaker.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_SoulMaker : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_SoulMaker();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_SoulMaker.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d125a10ca5c51ed4d9dfdb67deec96b8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StonePillar.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_StonePillar : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_StonePillar();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_StonePillar.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 4b4697e2c94f5524f9f92205e930dfb3
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Thief.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_Thief : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_Thief();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Thief.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 244c33b4353d40a43b593e7d4a644d2c
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Twinbee.cs

@@ -0,0 +1,30 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class Buff_Twinbee : Buff
+{
+    public override void Settle()
+    {
+        
+    }
+
+   
+
+    public override void SettleEnemy(EnemyNode enemyNode)
+    {
+
+        
+
+    }
+
+  
+    public override Buff NewBuff(int value)
+    {
+        Buff buff = new Buff_Twinbee();
+        buff.value = value;
+        buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_liuxue_v01");
+        return buff;
+    }
+}

ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_Twinbee.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: ebc3ff6ad022aaa48b661681d53aa6a5
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -15,6 +15,7 @@ public class AcidRainCloud : Enemy
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shootAndPollute), 0.4f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 0.6f);
         enemyNode.sufferAbnormalCondition(AbnormalCondition.acidRain, 1);
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.vulnerable, 3);
     }
 
     private void Update()

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

@@ -14,6 +14,7 @@ public class BoundSoul : Enemy
     {
         enemyNode = GetComponent<EnemyNode>();
         enemyNode.sufferAbnormalCondition(AbnormalCondition.parasitism, 1);
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_BoundSoul, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 1.0f);
     }
 
@@ -55,6 +56,7 @@ public class BoundSoul : Enemy
     public override IEnumerator MeleeAttackAction()
     {
         MapUnity currentNode = getNodeTools.LocationToGetNode(enemyNode.positionX, enemyNode.positionY);
+        int damageCount = 2;
         if (getNodeTools.canRemoteAttack(currentNode, enemyNode.EnemyState.attackRange))
         {
             if (!enemyNode.EnemyState.abnormalCondition.ContainsKey(AbnormalCondition.disarm))
@@ -62,7 +64,11 @@ public class BoundSoul : Enemy
                 yield return StartCoroutine(enemyNode.MeleeAttackAim());
                 // enemyNode.anim.SetTrigger("MeleeAttack");
                 // yield return new WaitForSeconds(0.5f);
-                AttackDamage(enemyNode.EnemyState.damage,2);
+                if (MapUnityManager.Instance.enemyNodeCount>15)
+                {
+                    damageCount++;
+                }
+                AttackDamage(enemyNode.EnemyState.damage, damageCount);
             }
         }
         else
@@ -77,7 +83,11 @@ public class BoundSoul : Enemy
                     yield return StartCoroutine(enemyNode.MeleeAttackAim());
                     // enemyNode.anim.SetTrigger("MeleeAttack");
                     //  yield return new WaitForSeconds(0.5f);
-                    AttackDamage(enemyNode.EnemyState.damage,2);
+                    if (MapUnityManager.Instance.enemyNodeCount > 15)
+                    {
+                        damageCount++;
+                    }
+                    AttackDamage(enemyNode.EnemyState.damage, damageCount);
                 }
             }
         }

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

@@ -9,6 +9,8 @@ public class ContaminatusImmortalis : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_ContaminatusImmortalis, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 0.7f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shootAndPollute), 0.3f);
     }

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

@@ -32,7 +32,7 @@ public class Enemy : MonoBehaviour
     {
 
         StartCoroutine(JudgNextActionCoroutine());
-
+        
     }
     public virtual void ChooseAction()
     {

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

@@ -220,7 +220,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
             if (mapUnities.Contains(getNodeTools .LocationToGetNode (positionX ,positionY)))
             {
                 enemyUIBar.isSync = false;
-                float remainDamage = EnemyState.shieldValue - Usermanager.Instance.expectDamage;
+                float remainDamage = EnemyState.shieldValue - SufferDamageCalculation((int)Usermanager.Instance.expectDamage);
                 if (remainDamage >= 0)
                 {
                     enemyUIBar.sheildText.text = remainDamage.ToString();
@@ -229,7 +229,9 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
                 {
                     enemyUIBar.sheildText.text = "0";
                     enemyUIBar.expHPBar.gameObject.SetActive(true);
-                    enemyUIBar.currentHPText.text = (EnemyState.currentHP + remainDamage).ToString();
+                    int val = (int)(EnemyState.currentHP + remainDamage);
+                    MathTool.keepNature(ref val);
+                    enemyUIBar.currentHPText.text = val.ToString();
                     enemyUIBar.expHPBar.fillAmount = EnemyState.currentHP / EnemyState.maxHP;
                     enemyUIBar.expAfterHPBar.fillAmount = (EnemyState.currentHP + remainDamage) / EnemyState.maxHP;
                 }
@@ -1696,8 +1698,8 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver
         {
             stoneSkinMultiply = 0.5f;
         }
-        damage = (int)(EnemyState.sufferDamageMultiply * damage* stoneSkinMultiply* halfDamageInBlackMultiply);
-        return damage;
+        int trueDamage = (int)(EnemyState.sufferDamageMultiply * damage* stoneSkinMultiply* halfDamageInBlackMultiply);
+        return trueDamage;
     }
 
     //½áËãÉ˺¦

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

@@ -15,6 +15,7 @@ public class FailedSample: Enemy
     {
         enemyNode = GetComponent<EnemyNode>();
         enemyNode.sufferAbnormalCondition(AbnormalCondition.corrode, 1);
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_FailedSample, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attackAndPollute), 1.0f);
     }
 

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

@@ -12,11 +12,12 @@ public class Leviathan : Enemy
     private void Start()
     {
         enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.stoneSkin, 4);
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.shedding, 7);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attackAndPollute), 0.3f);
         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, 7);
+        
     }
     public override void SettlePlannText(EnemyAction currentAction)
     {

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

@@ -14,6 +14,7 @@ public class LivingArmor : Enemy
     {
         enemyNode = GetComponent<EnemyNode>();
         enemyNode.sufferAbnormalCondition(AbnormalCondition.shedding, 1);
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_LivingArmor, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.spell), 1.0f);
     }
 

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

@@ -14,6 +14,8 @@ public class Pharmacist : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_Pharmacist, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shootAndPollute), 0.5f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shieldAndPollution), 0.5f);
     }

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

@@ -11,6 +11,8 @@ public class PollutionSpreader : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_PollutionSpreader, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.spellAndAttack), 0.3f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.pollution), 0.3f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 0.4f);

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

@@ -11,6 +11,8 @@ public class PrismReflector : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_PrismReflector, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shieldAndPollution), 0.5f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.spell), 0.5f);
     }

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

@@ -12,6 +12,8 @@ public class RatWarrior : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_RatWarrior, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 0.5f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.spell), 0.5f);
     }

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

@@ -11,6 +11,8 @@ public class ReconnaissanceBee : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_ReconnaissanceBee, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 0.5f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shootAndPollute), 0.5f);
     }

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

@@ -15,6 +15,8 @@ public class SoulMaker : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_SoulMaker, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.spell), 0.5f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.summon), 0.5f);
     }

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

@@ -12,6 +12,8 @@ public class StonePillar : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_StonePillar, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.pollution), 1.0f);
     }
 

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

@@ -14,6 +14,8 @@ public class Thief : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_Thief, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 0.7f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.shootAndPollute), 0.3f);
         //actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.sleep), 0.4f);

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

@@ -11,6 +11,8 @@ public class Twinbee : Enemy
 
     private void Start()
     {
+        enemyNode = GetComponent<EnemyNode>();
+        enemyNode.sufferAbnormalCondition(AbnormalCondition.Buff_Twinbee, 1);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.attack), 0.5f);
         actionPool.Add(EnemyPlanUIManager.Instance.NewAction(EnemyPlanUIFunction.aoe), 0.5f);
     }

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

@@ -117,6 +117,32 @@ public class AbnormalCondition : Singleton<AbnormalCondition>
     public const string nextDrawCardisDisposable = "99";
     //在污染地块上半伤
     public const string halfDamageInBlack = "100";
+    //Buff_SoulMaker
+    public const string Buff_SoulMaker = "101";
+    //Buff_BoundSoul
+    public const string Buff_BoundSoul = "102";
+    //Buff_FailedSample
+    public const string Buff_FailedSample = "103";
+    //Buff_Pharmacist
+    public const string Buff_Pharmacist = "104";
+    //Buff_RatWarrior
+    public const string Buff_RatWarrior = "105";
+    //Buff_LivingArmor
+    public const string Buff_LivingArmor = "106";
+    //Buff_Twinbee
+    public const string Buff_Twinbee = "107";
+    //Buff_ReconnaissanceBee
+    public const string Buff_ReconnaissanceBee = "108";
+    //Buff_StonePillar
+    public const string Buff_StonePillar = "109";
+    //Buff_PrismReflector
+    public const string Buff_PrismReflector = "110";
+    //Buff_PollutionSpreader
+    public const string Buff_PollutionSpreader = "111";
+    //Buff_Thief
+    public const string Buff_Thief = "112";
+    //Buff_ContaminatusImmortalis
+    public const string Buff_ContaminatusImmortalis = "113";
 
     public static readonly List<string> canNegativeNumberList = new List<string> { angerUpperDamage, shieldUpperValue, addDrawCard };
 

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

@@ -193,7 +193,7 @@ public static class Name
         switch (kvp.Key)
         {
             case CardFunction.cardDamage:
-                sb.Append("<link=\""+ kvp.Key+ "\">造成" + kvp.Value + "点伤害</link>");
+                sb.Append("<link=\""+ kvp.Key+ "\">造成" + Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value))  + "点伤害</link>");
                 break;
             case CardFunction.cardShield:
                 sb.Append("<link=\"" + kvp.Key + "\">获得" + kvp.Value + "点护盾</link>");
@@ -399,7 +399,7 @@ public static class Name
                 break;
             case CardFunction.damagexy:
                 string[] values = kvp.Value.Split("-");
-                sb.Append("<link=\"" + kvp.Key + "\">造成" + values[0] + "点伤害" + values[1] + "次</link>");
+                sb.Append("<link=\"" + kvp.Key + "\">造成" + Usermanager.Instance.DamageCalculation(int.Parse(values[0])) + "点伤害" + values[1] + "次</link>");
                 break;
             case CardFunction.repel:
                 sb.Append("击退" + kvp.Value + "格");

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

@@ -61,9 +61,22 @@ public class BuffDataManager : Singleton<BuffDataManager>
         abnormalCondition.Add("98", new Buff_AcidRain());
         abnormalCondition.Add("99", new Buff_NextDrawCardisDisposable());
         abnormalCondition.Add("100", new Buff_HalfDamageInBlack());
+        abnormalCondition.Add("101", new Buff_SoulMaker());
+        abnormalCondition.Add("102", new Buff_BoundSoul());
+        abnormalCondition.Add("103", new Buff_FailedSample());
+        abnormalCondition.Add("104", new Buff_Pharmacist());
+        abnormalCondition.Add("105", new Buff_RatWarrior());
+        abnormalCondition.Add("106", new Buff_LivingArmor());
+        abnormalCondition.Add("107", new Buff_Twinbee());
+        abnormalCondition.Add("108", new Buff_ReconnaissanceBee());
+        abnormalCondition.Add("109", new Buff_StonePillar());
+        abnormalCondition.Add("110", new Buff_PrismReflector());
+        abnormalCondition.Add("111", new Buff_PollutionSpreader());
+        abnormalCondition.Add("112", new Buff_Thief());
+        abnormalCondition.Add("113", new Buff_ContaminatusImmortalis());
 
-        abnormalCondition.Add("106", new Buff_flashPoint());
-        abnormalCondition.Add("107", new Buff_BonePile());
+        abnormalCondition.Add("206", new Buff_flashPoint());
+        abnormalCondition.Add("207", new Buff_BonePile());
         
     }
 
@@ -105,6 +118,38 @@ public class BuffDataManager : Singleton<BuffDataManager>
                 return "死亡时对周围进行污染";
             case AbnormalCondition.downSpeed:
                 return "移动力减少1点，持续X回合";
+            case AbnormalCondition.Buff_SoulMaker:
+                return "污染格数>12时，所有敌人增加2移速";
+            case AbnormalCondition.Buff_BoundSoul:
+                return "污染格数>15时，伤害段数+1";
+            case AbnormalCondition.Buff_FailedSample:
+                return "不稳定：如果回合结束时候在不污染地块，随机获得一种减益";
+            case AbnormalCondition.Buff_Pharmacist:
+                return ":回合结束时，移除其他怪物（除自身外）的一个减益效果，每移除一层，随机造成怪物周围一处污染";
+            case AbnormalCondition.Buff_RatWarrior:
+                return "生命值越低伤害越低";
+            case AbnormalCondition.Buff_LivingArmor:
+                return "回合开始时，如果他旁边一个怪物站在污染地块上，他会附身这个怪物";
+            case AbnormalCondition.Buff_Twinbee:
+                return "回合结束时，周围有污染地块时，获得8点护盾";
+            case AbnormalCondition.Buff_ReconnaissanceBee:
+                return "站在污染地块上，对玩家释放的技能和攻击会造成1致残";
+            case AbnormalCondition.shedding:
+                return "每收到一次攻击，污染周围一圈地块";
+            case AbnormalCondition.Buff_StonePillar:
+                return "被破坏后，减少巨兽一层石肤";
+            case AbnormalCondition.acidRain:
+                return "每次收到攻击，随机污染3格玩家地块";
+            case AbnormalCondition.halfDamageInBlack:
+                return "当站在污染地块上时收到伤害减少50%";
+            case AbnormalCondition.Buff_PrismReflector:
+                return "回合开始时，若站在玩家地块上，对玩家造成该颜色地块数量伤害";
+            case AbnormalCondition.Buff_PollutionSpreader:
+                return "若站在污染地块上，强化使用的技能";
+            case AbnormalCondition.Buff_Thief:
+                return "若站在污染地块上，攻击同时偷取4点锻造点";
+            case AbnormalCondition.Buff_ContaminatusImmortalis:
+                return "周围有污染地块时，攻击护盾造成双倍伤害";
 
         }
         return " ";

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

@@ -1120,6 +1120,17 @@ public class SettlementManager : Singleton<SettlementManager>
                    // damageWork(int.Parse(kvp.Value), influencePreviewPool, pierceNum);
                     Usermanager .Instance .expectDamage = Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value));
                     break;
+                case CardFunction.damagexy:
+                    string[] values = kvp.Value.Split("-");
+                    int damageVal = int.Parse(values[0]);
+                    int damageCount = int.Parse(values[1]);
+                    // damageWork(int.Parse(kvp.Value), influencePreviewPool, pierceNum);
+                    for (int i = 0; i < damageCount; i++)
+                    {
+                        Usermanager.Instance.expectDamage+= Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value));
+                    }
+                    //Usermanager.Instance.expectDamage = Usermanager.Instance.DamageCalculation(int.Parse(kvp.Value));
+                    break;
                 case CardFunction.nodeDiffDamage:
                     if (GameManager.Instance.getNodeDiffForPlayer() > 0)
                     {

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

@@ -52,6 +52,8 @@ public class Usermanager : Singleton<Usermanager>
 
     [Header("角色将要造成的伤害")]
     public float expectDamage;
+    [Header("角色将要造成的单次伤害")]
+    public float expectOnceDamage;
     //费用和步数检查
     int lastCost;//上一帧的费用
     int lastStep;
@@ -547,6 +549,7 @@ public class Usermanager : Singleton<Usermanager>
     //伤害计算函数
     public int DamageCalculation(int damage)
     {
+        int trueDamage = 0;
         int angerUpperDamage = 0;
         //红色站立效果
         if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Red))
@@ -568,10 +571,10 @@ public class Usermanager : Singleton<Usermanager>
         {
             damagemultiply = 1f;
         }
-        damage = (int)((damage + angerUpperDamage ) * damagemultiply);
-        MathTool.keepNature(ref damage);
+        trueDamage = (int)((damage + angerUpperDamage ) * damagemultiply);
+        MathTool.keepNature(ref trueDamage);
        
-        return damage;
+        return trueDamage;
     }
 
     //护盾计算函数