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 0000000000000000000000000000000000000000..d1488a4a0577afd16480717652a82d839c1adfde GIT binary patch literal 18740 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 LPBx85zxaOvrTNJ< literal 0 HcmV?d00001 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)) {