diff --git a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab index e5b17358..df365f68 100644 --- a/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab +++ b/ColorlessWorld-2024-4-2/Assets/Prefab/EnemyUIBar/EnemyInSenceCanvas(Clone).prefab @@ -439,7 +439,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 + m_PresetInfoIsWorld: 1 --- !u!114 &8739798778191560965 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1107,6 +1107,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: attackDamageText: {fileID: 2775492048492059182} + enemyUIBar: {fileID: 8570734685845233804} --- !u!1 &8512930589043633716 GameObject: m_ObjectHideFlags: 0 diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/downSpeed.png b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/downSpeed.png new file mode 100644 index 00000000..d1488a4a Binary files /dev/null and b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/downSpeed.png differ diff --git a/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/downSpeed.png.meta b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/downSpeed.png.meta new file mode 100644 index 00000000..70f7cb97 --- /dev/null +++ b/ColorlessWorld-2024-4-2/Assets/Resources/BuffIcon_v02/downSpeed.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 0e1df2f3e01867d44b97f1b40a04a29f +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 1537655665 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs index 641e1d8e..759f8f75 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Buff/Buff_DownStepRange.cs @@ -24,7 +24,7 @@ public class Buff_DownStepRange : Buff { Buff buff = new Buff_DownStepRange(); buff.value = value; - buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "Sslx_Ui_Buff_sudu2_v01"); + buff.icon = BuffDataManager.Instance.LoadImage(iconPath + "downSpeed"); return buff; } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs index 84bd5c8d..e4bdc75a 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/DarkCloud.cs @@ -162,7 +162,7 @@ public class DarkCloud : MonoBehaviour } IEnumerator ShieldAction() { - enemyNode.EnemyState.shieldValue += 10; + enemyNode.EnemyState.shieldValue += 4; MapUnity currentNode = GameManager.Instance.X[enemyNode.positionX].Y[enemyNode.positionY]; HashSet targetNodes=new HashSet { currentNode }; getNodeTools.getCircleNodeForEnemy(targetNodes,1); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs index 2449f1b4..e3398c93 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/EnemyNode.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Xml; using UnityEngine; using UnityEngine.Assertions; +using UnityEngine.UI; using static UnityEngine.Rendering.DebugUI; public class EnemyNode : MonoBehaviour,IEnemyObserver @@ -27,6 +28,9 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver public List rangePool = new List();//范围预览 public List aoeRangePool = new List();//范围预览 + + public string stateText=new string(""); + [Header("走路参数")] public float jumpHeight; public float posCount; @@ -58,6 +62,7 @@ public class EnemyNode : MonoBehaviour,IEnemyObserver public int lasteHp; [Header("敌人状态机")] public Animator anim; + public enum EnemyType { enemy, diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs index 2b13839f..592433b7 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Enemy/Grinfiend.cs @@ -194,7 +194,7 @@ public class Grinfiend : MonoBehaviour break; case "weak": Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.weak, 1); - Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.addDrawCard, -1); + //Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.addDrawCard, -1); break; case "vulnerable": Usermanager.Instance.SufferPlayerAbnormalCondition(AbnormalCondition.vulnerable, 1); diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs index d0bf9dde..a4563bed 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction.cs @@ -7,10 +7,11 @@ public class EnemyAction { public Sprite sprite; public bool isAiming =true ;//是否需要连线 - public virtual void SettleText( EnemyNode enemyNode ,Text attackDamageText,Text stateText) + public virtual void SettleText( EnemyNode enemyNode ,Text attackDamageText) { + Debug.Log("基本"); attackDamageText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString(); - stateText.text = "这个敌人将会造成" + attackDamageText.text + "点伤害。" + "这个敌人将会移动" + (enemyNode.getStepRange()).ToString() + "个格子。"; + enemyNode.stateText = "这个敌人将会造成" + attackDamageText.text + "点伤害。" + "这个敌人将会移动" + (enemyNode.getStepRange()).ToString() + "个格子。"; } public virtual EnemyAction NewAction() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs index b31bf801..5831e5e0 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Aoe.cs @@ -4,10 +4,10 @@ using UnityEngine; using UnityEngine.UI; public class EnemyActionAction_Aoe : EnemyAction { - public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + public override void SettleText(EnemyNode enemyNode, Text attackDamageText) { attackDamageText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString(); - stateText.text = "这个敌人将会造成" + attackDamageText.text + "点范围伤害。"; + enemyNode.stateText = "这个敌人将会造成" + attackDamageText.text + "点范围伤害。"; } public override void AttackRange(EnemyNode enemyNode) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_DeBuff.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_DeBuff.cs index 7a981b12..6e77e621 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_DeBuff.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_DeBuff.cs @@ -5,10 +5,10 @@ using UnityEngine.UI; public class EnemyActionAction_DeBuff : EnemyAction { - public override void SettleText(EnemyNode enemyNode, Text attackDamageText ,Text stateText) + public override void SettleText(EnemyNode enemyNode, Text attackDamageText) { attackDamageText.text = ""; - stateText.text = "这个敌人将施加负面效果"; + enemyNode.stateText = "这个敌人将施加负面效果"; } public override EnemyAction NewAction() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Random.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Random.cs index ca89d80c..965cd600 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Random.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Random.cs @@ -5,11 +5,11 @@ using UnityEngine.UI; public class EnemyActionAction_Random : EnemyAction { - public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + public override void SettleText(EnemyNode enemyNode, Text attackDamageText) { attackDamageText.text = ""; - stateText.text = "这个敌人的行动无法预测"; + enemyNode.stateText = "这个敌人的行动无法预测"; } public override EnemyAction NewAction() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shield.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shield.cs index d510069d..cf8c07a6 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shield.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shield.cs @@ -6,10 +6,10 @@ using UnityEngine.UI; public class EnemyActionAction_Shield : EnemyAction { - public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + public override void SettleText(EnemyNode enemyNode, Text attackDamageText) { attackDamageText.text = ""; - stateText.text = "这个敌人将增加" + attackDamageText.text + "点护盾"; + enemyNode.stateText = "这个敌人将增加" + attackDamageText.text + "点护盾"; } public override EnemyAction NewAction() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shoot.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shoot.cs index f4333da0..04ea6e46 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shoot.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_Shoot.cs @@ -5,10 +5,10 @@ using UnityEngine.UI; public class EnemyActionAction_Shoot : EnemyAction { - public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + public override void SettleText(EnemyNode enemyNode, Text attackDamageText) { attackDamageText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString(); - stateText.text = "这个敌人将会造成" + attackDamageText.text + "点伤害。" ; + enemyNode.stateText = "这个敌人将会造成" + attackDamageText.text + "点伤害。" ; } public override void AttackRange(EnemyNode enemyNode) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_UpBuff.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_UpBuff.cs index 6013037c..238dcfff 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_UpBuff.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyActionAction_UpBuff.cs @@ -5,10 +5,10 @@ using UnityEngine.UI; public class EnemyActionAction_UpBuff :EnemyAction { - public override void SettleText(EnemyNode enemyNode, Text attackDamageText,Text stateText) + public override void SettleText(EnemyNode enemyNode, Text attackDamageText) { attackDamageText.text = ""; - stateText.text = "这个敌人将施加强化效果"; + enemyNode.stateText = "这个敌人将施加强化效果"; } public override EnemyAction NewAction() diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_AttackAndShield.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_AttackAndShield.cs index cf4d55b2..48e10a34 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_AttackAndShield.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_AttackAndShield.cs @@ -4,10 +4,11 @@ using UnityEngine; using UnityEngine.UI; public class EnemyAction_AttackAndShield : EnemyAction { - public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + public override void SettleText(EnemyNode enemyNode, Text attackDamageText) { + Debug.Log("护盾"); attackDamageText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString(); - stateText.text = "这个敌人将会造成" + attackDamageText.text + "点伤害。" + "这个敌人将会移动" + (enemyNode.getStepRange()).ToString() + "个格子。"; + enemyNode.stateText = "这个敌人将会造成" + attackDamageText.text + "点伤害并且获得护盾" ; } public override EnemyAction NewAction() { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_ShootAndPollute.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_ShootAndPollute.cs index c183899c..ca3f07b4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_ShootAndPollute.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_ShootAndPollute.cs @@ -4,10 +4,11 @@ using UnityEngine; using UnityEngine.UI; public class EnemyAction_ShootAndPollute : EnemyAction { - public override void SettleText(EnemyNode enemyNode, Text attackDamageText, Text stateText) + public override void SettleText(EnemyNode enemyNode, Text attackDamageText) { + Debug.Log("污染"); attackDamageText.text = (enemyNode.EnemyState.damage * enemyNode.EnemyState.damageMultiplier).ToString(); - stateText.text = "这个敌人将会造成" + attackDamageText.text + "点伤害。" + "这个敌人将会污染格子格子。"; + enemyNode.stateText = "这个敌人将会造成" + attackDamageText.text + "点伤害并且污染格子。"; } public override void AttackRange(EnemyNode enemyNode) { diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_Weak.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_Weak.cs index aa9678ef..7259719f 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_Weak.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/EnemyPlanFunction/EnemyAction_Weak.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class EnemyAction_Weak : EnemyAction { @@ -10,4 +11,10 @@ public class EnemyAction_Weak : EnemyAction action.sprite = this.sprite; return action; } + + public override void SettleText(EnemyNode enemyNode, Text attackDamageText) + { + attackDamageText.text = ""; + enemyNode.stateText = "这个敌人将施加负面效果"; + } } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs index cec5f3e6..001f4e37 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/Legacy/LegacyManager.cs @@ -22,7 +22,7 @@ public class LegacyManager : Singleton ; public HashSet commonRelicsSet = new HashSet - {Name.Legacy.LegacyNode_EnchantedConch,Name.Legacy.LegacyNode_GoldVines, + {Name.Legacy.LegacyNode_GoldVines, Name.Legacy.LegacyNode_SnakeGall,Name.Legacy.LegacyNode_AgnisTorch } ; diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs index 827b0743..7e78040b 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyPlanActionUI.cs @@ -10,13 +10,15 @@ public class EnemyPlanActionUI : MonoBehaviour // public EnemyNode enemyNode; public Text attackDamageText; + public EnemyUIBar enemyUIBar; + //外部引用EnemyManager GameObject planPanle; Text stateText; private void Start() { planPanle = EnemyManager.Instance.planPanle; - stateText = EnemyManager.Instance.stateText; + } private void OnMouseEnter() { @@ -26,6 +28,11 @@ public class EnemyPlanActionUI : MonoBehaviour { if (TurnMaster.Instance.turn == TurnMaster.Turn.playerTurn && GameManager.Instance.onDrag == false) { + if (stateText == null) + { + Debug.Log("成功空"); + } + EnemyManager.Instance.stateText.text = enemyUIBar.enemyNode.stateText; planPanle.SetActive(true); planPanle.transform.position = Mouse.current.position.value; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs index 2738acc4..bd158ad4 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/UI/EnemyUIBar.cs @@ -45,9 +45,11 @@ public class EnemyUIBar : MonoBehaviour { planImage.sprite = enemyPlanAction.sprite; - enemyPlanAction.SettleText(enemyNode, attackDamageText, EnemyManager.Instance.stateText); + enemyNode .currentActionScript = enemyPlanAction; enemyNode.currentActionScript.AttackRange(enemyNode); + enemyPlanAction.SettleText(enemyNode, attackDamageText); + } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs index aef99990..7efe94e3 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/BuffDataManager.cs @@ -63,9 +63,27 @@ public class BuffDataManager : Singleton { switch (buffName ) { - case CardFunction.vulnerable: + case AbnormalCondition.vulnerable: return "受到的伤害增加50%，持续x回合"; - + case AbnormalCondition.fireSeed: + return "每累计10层承受15点伤害，将火种层数减少10"; + case AbnormalCondition.posion: + return "在目标回合开始时，减少X点生命然后将中毒层数减少1"; + case AbnormalCondition.wet: + return "每累计10层使怪物无法行动一回合，并失去所有潮湿层数"; + case AbnormalCondition.coma: + return "无法行动"; + case AbnormalCondition.weak: + return "攻击造成的伤害减少25%，持续X回合"; + case AbnormalCondition.parasitism: + return "移动会污染地面"; + case AbnormalCondition.corrode: + return "移动会污染地面"; + case AbnormalCondition.boomAndPollute: + return "死亡时对周围进行污染"; + case AbnormalCondition.downSpeed: + return "移动力减少1点，持续X回合"; + } return " "; } diff --git a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs index e303f5a8..b65dcf24 100644 --- a/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs +++ b/ColorlessWorld-2024-4-2/Assets/Scripts/manager/Usermanager.cs @@ -477,7 +477,7 @@ public class Usermanager : Singleton //红色站立效果 if (MapUnityManager.Instance.isPlayerOn(Name.NodeColor.Red)) { - damage += 1; + damage += 2; } if (playerAbnormalCondition .ContainsKey (AbnormalCondition.angerUpperDamage)) {