diff --git a/meng_yao/Assets/Config/MengYao_Skill_Date.txt b/meng_yao/Assets/Config/MengYao_Skill_Date.txt index ce7cc3b2..ff3dd95d 100644 --- a/meng_yao/Assets/Config/MengYao_Skill_Date.txt +++ b/meng_yao/Assets/Config/MengYao_Skill_Date.txt @@ -46,7 +46,7 @@ } } }, - "M_H_002": { + "M_H_002": { "S_1": { "1": { "AttackCooldown": -0.25 @@ -181,7 +181,7 @@ "DamageBuff": 0.15 }, "3": { - "AttackCooldown": 0.1 + "AttackCooldown": -0.1 }, "4": { "DamageBuff": 0.35 @@ -193,20 +193,26 @@ }, "S_2": { "1": { - "DamageBuff": 0.2 + "SkillList": [ + "skill_3" + ] }, "2": { "DamageBuff": 0.15 }, "3": { - "AttackContinues": -0.25, + "SkillList": [ + "skill_4" + ], "AttackCooldown": 0.05 }, "4": { "DamageBuff": 0.35 }, "5": { - "Damage": 0.5, + "SkillList": [ + "skill_5" + ], "AttackCooldown": 0.05 } } diff --git a/meng_yao/Assets/Prefabs/charatar/ssm.prefab b/meng_yao/Assets/Prefabs/charatar/ssm.prefab index 2a03df3c..9bf4ce82 100644 --- a/meng_yao/Assets/Prefabs/charatar/ssm.prefab +++ b/meng_yao/Assets/Prefabs/charatar/ssm.prefab @@ -419,7 +419,7 @@ GameObject: - component: {fileID: 8433650274028726420} - component: {fileID: -3836672401185760439} - component: {fileID: 1608620729910401442} - - component: {fileID: 3515768272336358004} + - component: {fileID: 651846183260528305} m_Layer: 0 m_Name: ssm m_TagString: Player @@ -514,7 +514,7 @@ MonoBehaviour: normalIndex: 0 isHit: 0 myTags: 0 - mySkillUp: {fileID: 3515768272336358004} + mySkillUp: {fileID: 651846183260528305} IsDead: 0 HaveDieTime: 0 enemyId: @@ -573,7 +573,7 @@ MonoBehaviour: m_EditorClassIdentifier: tower: {fileID: 0} Tag: tower ---- !u!114 &3515768272336358004 +--- !u!114 &651846183260528305 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -582,10 +582,10 @@ MonoBehaviour: m_GameObject: {fileID: 8433650275485930554} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8264f0a4afc0aa347bf9dad42df2617a, type: 3} + m_Script: {fileID: 11500000, guid: 6b63bc5ded9488a46aebdd6b1981625e, type: 3} m_Name: m_EditorClassIdentifier: - description: "\u66F4\u65B0\u540E\u7684\u840C\u8000\uFF0C\uFF1A\u4F7F\u7528\u65B9\u6CD5xxxxxxxx" + description: "\u66F4\u65B0\u540E\u7684\u840C\u5996\uFF0C\uFF1A\u4F7F\u7528\u65B9\u6CD5xxxxxxxx" role: {fileID: 8433650274028726420} attack: {fileID: 7276635428522831207} attackRange: 0 diff --git a/meng_yao/Assets/Scenes/New/Scene_map_1gl.unity b/meng_yao/Assets/Scenes/New/Scene_map_1ngl.unity similarity index 99% rename from meng_yao/Assets/Scenes/New/Scene_map_1gl.unity rename to meng_yao/Assets/Scenes/New/Scene_map_1ngl.unity index 957816f7..b8491fef 100644 --- a/meng_yao/Assets/Scenes/New/Scene_map_1gl.unity +++ b/meng_yao/Assets/Scenes/New/Scene_map_1ngl.unity @@ -1456,8 +1456,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d98d344c0c9573d45a72a1677d806d7d, type: 3} m_Name: m_EditorClassIdentifier: - retbutton: {fileID: 0} - ClosureObj: {fileID: 0} + description: expNumber: 0 expNumberText: {fileID: 385770246} maxExpNumber: 20 @@ -3595,8 +3594,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 36d8b1f23f0ec174594a18d38154925d, type: 3} m_Name: m_EditorClassIdentifier: - retbutton: {fileID: 0} - ClosureObj: {fileID: 0} + description: mengyaoNumber: 3 inPlaceNumber: 0 btnObj: {fileID: 1942153352} @@ -4374,6 +4372,7 @@ GameObject: - component: {fileID: 1337722729} - component: {fileID: 1337722730} - component: {fileID: 1337722731} + - component: {fileID: 1337722732} m_Layer: 0 m_Name: ReadJson m_TagString: Untagged @@ -4408,6 +4407,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ef2ffa387be5c84478c8cf2baec66c02, type: 3} m_Name: m_EditorClassIdentifier: + description: m_Asset: {fileID: 4900000, guid: 6a6cdf5342b444d4fbff4fccbb54f98a, type: 3} NameAsset: {fileID: 4900000, guid: e414de6ecc2f57d4ba107a5433dd54f5, type: 3} LevelAsset: {fileID: 4900000, guid: 89bbacca41b409b4dbf238a43bbb2e4b, type: 3} @@ -4425,8 +4425,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f1617263e713d804995e0d3f3073e0cb, type: 3} m_Name: m_EditorClassIdentifier: + description: MapLevelJson: {fileID: 4900000, guid: b534002cbb7fddf4bb68f34fb1357ff3, type: 3} count: 0 +--- !u!114 &1337722732 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1337722728} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 39d4d2c40e6ce1e45bb8069dc25b05e8, type: 3} + m_Name: + m_EditorClassIdentifier: + description: + _Json: {fileID: 4900000, guid: 580cfe3a34ab71847870fa8a367f7e93, type: 3} --- !u!1 &1342038372 GameObject: m_ObjectHideFlags: 0 @@ -5119,10 +5134,10 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 60 - m_Alignment: 5 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 - m_HorizontalOverflow: 0 + m_HorizontalOverflow: 1 m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 0/20 @@ -5523,8 +5538,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 55658941a61a95a449a60aa939a8c641, type: 3} m_Name: m_EditorClassIdentifier: - retbutton: {fileID: 0} - ClosureObj: {fileID: 0} + description: BloodText: {fileID: 1288391609} MaxHp: 20 NowShowInfo: {fileID: 0} @@ -5895,11 +5909,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 97664c5246bb0d242997921b3560d036, type: 3} m_Name: m_EditorClassIdentifier: - retbutton: {fileID: 0} - ClosureObj: {fileID: 0} + description: SpawnLocations: - {fileID: 734893407} enemysList: [] + MengYaoList: [] + SortList: [] --- !u!1 &1910338484 GameObject: m_ObjectHideFlags: 0 @@ -5970,15 +5985,12 @@ MonoBehaviour: - id: M_H_002 prefab: {fileID: 8433650275485930554, guid: b23a54d617796b04d832ddf0cd85a319, type: 3} cardprefab: {fileID: 1126466392417920613, guid: 3de98a391a58e5a4fa74ff1107105986, type: 3} - - id: M_S_003 - prefab: {fileID: 8433650275485930554, guid: 289ffd028fbe21746a0f4b8c15273104, type: 3} - cardprefab: {fileID: 5508436327438263543, guid: caccfa6e2b899134ab6db84047d090f7, type: 3} - id: M_T_001 prefab: {fileID: 8433650275485930554, guid: c06add8b28931e4448ca9673388595af, type: 3} cardprefab: {fileID: 5508436327438263543, guid: 93fef5acddd00004b9ba1f30ccd46c96, type: 3} - - id: M_J_004 - prefab: {fileID: 8433650275485930554, guid: 6b6027f8de5772a40a1a016917855070, type: 3} - cardprefab: {fileID: 5508436327438263543, guid: b11fe0bf453623a4c847b716ebbed379, type: 3} + - id: M_S_003 + prefab: {fileID: 8433650275485930554, guid: 289ffd028fbe21746a0f4b8c15273104, type: 3} + cardprefab: {fileID: 5508436327438263543, guid: caccfa6e2b899134ab6db84047d090f7, type: 3} --- !u!114 &1910338487 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/meng_yao/Assets/Scenes/New/Scene_map_1gl.unity.meta b/meng_yao/Assets/Scenes/New/Scene_map_1ngl.unity.meta similarity index 74% rename from meng_yao/Assets/Scenes/New/Scene_map_1gl.unity.meta rename to meng_yao/Assets/Scenes/New/Scene_map_1ngl.unity.meta index 268b9562..06da4e21 100644 --- a/meng_yao/Assets/Scenes/New/Scene_map_1gl.unity.meta +++ b/meng_yao/Assets/Scenes/New/Scene_map_1ngl.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6a5f3c28f71eee045b445e2c89394109 +guid: fc358ee96b92b364f8a6d851fe2d78e8 DefaultImporter: externalObjects: {} userData: diff --git a/meng_yao/Assets/Scenes/scene_Main.unity b/meng_yao/Assets/Scenes/scene_Main.unity index 31503e4f..b4b3225f 100644 --- a/meng_yao/Assets/Scenes/scene_Main.unity +++ b/meng_yao/Assets/Scenes/scene_Main.unity @@ -34202,27 +34202,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 600 objectReference: {fileID: 0} - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 733 objectReference: {fileID: 0} - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 300 objectReference: {fileID: 0} - target: {fileID: 3011360593699687250, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -366.5 objectReference: {fileID: 0} - target: {fileID: 3011360593729086421, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3} propertyPath: m_Sprite diff --git a/meng_yao/Assets/common b/meng_yao/Assets/common index cbe42ad6..e944cf98 160000 --- a/meng_yao/Assets/common +++ b/meng_yao/Assets/common @@ -1 +1 @@ -Subproject commit cbe42ad621dba92dff20e4fc5704f5d90973acbf +Subproject commit e944cf98696a3bc06d3030b13eb73f3bfe0bef2a diff --git a/meng_yao/Assets/script/A_Fight/SkillUp/ssm_SkillUp.cs b/meng_yao/Assets/script/A_Fight/SkillUp/ssm_SkillUp.cs new file mode 100644 index 00000000..9958d273 --- /dev/null +++ b/meng_yao/Assets/script/A_Fight/SkillUp/ssm_SkillUp.cs @@ -0,0 +1,108 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Unity.VisualScripting; +using UnityEngine; + +public class ssm_SkillUp : SkillUp +{ + /// + /// 射程提升1格位置 + /// + /// + private float poisonDuration = 10;//中毒时间 + private float poisonInterval = 2;//中毒间隔 + private float poisonDamage = 10;//中毒伤害 + Action decelerationBuff; + public void Start() + { + + + decelerationBuff = CreatePoisonBuff(poisonDuration, poisonInterval, poisonDamage, role); + + // 将 Buff 添加到玩家的 storageBuff 列表中 + role.AddBuff(role.storageBuff, decelerationBuff); + + } + + public override void useskill(string str) + { + if (str == "skill_3") /// 敌人中毒后受到伤害提升20% + { + poisonDamage *= 1.2f; + SetPoisonBuff(); + Debug.Log("使用skill_3"); + } + if (str == "skill_4")/// 敌人中毒后毒药生效时间减少30% 攻击CD增加5% + { + + poisonInterval *= 0.7f; + SetPoisonBuff(); + } + if (str == "skill_5")/// 敌人中毒后受到伤害提升50%,攻击CD增加5% + { + + poisonDamage *= 1.5f; + SetPoisonBuff(); + } + } + + /*public override void Skill_1_1() + { + base.AttackRange = 1; + attack.SetAttackRange(); + } + /// + /// 攻击CD减少10% + /// + public override void Skill_1_3() + { + + base.AttackCooldown -= 0.1f; + } + /// + /// 每次扇形喷出3个毒雾攻击CD增加5% + /// + public override void Skill_1_5() + { + attack.BulletNumber = 3; + + } + + + /// + /// 敌人中毒后受到伤害提升20% + /// + public override void Skill_2_1() + { + poisonDamage *= 1.2f; + SetPoisonBuff(); + } + /// + /// 敌人中毒后毒药生效时间减少30% 攻击CD增加5% + /// + public override void Skill_2_3() + { + base.AttackCooldown += 0.05f; + poisonInterval *= 0.7f; + SetPoisonBuff(); + + } + /// + /// 敌人中毒后受到伤害提升50%,攻击CD增加5% + /// + public override void Skill_2_5() + { + + base.AttackCooldown += 0.05f; + poisonDamage *= 1.5f; + SetPoisonBuff(); + } + */ + private void SetPoisonBuff()//重置buff + { + role.RemoveBuff(role.storageBuff, decelerationBuff); + decelerationBuff = CreatePoisonBuff(poisonDuration, poisonInterval, poisonDamage, role); + role.AddBuff(role.storageBuff, decelerationBuff); + } +} diff --git a/meng_yao/Assets/script/A_Fight/SkillUp/ssm_SkillUp.cs.meta b/meng_yao/Assets/script/A_Fight/SkillUp/ssm_SkillUp.cs.meta new file mode 100644 index 00000000..4fa6692f --- /dev/null +++ b/meng_yao/Assets/script/A_Fight/SkillUp/ssm_SkillUp.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6b63bc5ded9488a46aebdd6b1981625e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: