diff --git a/meng_yao/Assets/Prefabs/charatar/enemy/wood_min.prefab b/meng_yao/Assets/Prefabs/charatar/enemy/wood_min.prefab index b3b01ff95..70a42d460 100644 --- a/meng_yao/Assets/Prefabs/charatar/enemy/wood_min.prefab +++ b/meng_yao/Assets/Prefabs/charatar/enemy/wood_min.prefab @@ -427,7 +427,7 @@ MonoBehaviour: spriteRenderer: {fileID: 4703411402842800734} image: {fileID: 0} isAnimationPlay: 1 - mycollider: {fileID: 0} + mycollider: {fileID: 5307107303863668509} attackClass: {fileID: 0} CurrentIndex: 33 hitIndex: 2 @@ -437,6 +437,8 @@ MonoBehaviour: mySkillUp: {fileID: 0} enemyId: moveSpeed: 2 + MengyaoSprite: {fileID: 0} + SkillSprites: [] harmNumber: 0 --- !u!210 &6468108308622956862 SortingGroup: @@ -617,7 +619,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: aa6f66265746cb041bbfdf887abe64f9, type: 3} + m_Sprite: {fileID: 21300000, guid: 645dca14ffff13041862597ed96cee91, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/meng_yao/Assets/common b/meng_yao/Assets/common index 7d53694eb..cdcf8585a 160000 --- a/meng_yao/Assets/common +++ b/meng_yao/Assets/common @@ -1 +1 @@ -Subproject commit 7d53694eb5a1302dad487dfa09580b1a1720da88 +Subproject commit cdcf8585abc0d49cdcac9356695c1e674a69efec diff --git a/meng_yao/Assets/script/A_Fight/enemy.cs b/meng_yao/Assets/script/A_Fight/enemy.cs index 9829816ed..79ce6acbf 100644 --- a/meng_yao/Assets/script/A_Fight/enemy.cs +++ b/meng_yao/Assets/script/A_Fight/enemy.cs @@ -9,6 +9,7 @@ public class enemy : Role [Header("移动速度")] public float moveSpeed; [Header("萌妖头像")] public Sprite MengyaoSprite; [Header("萌妖技能图标")] public List SkillSprites; + [HideInInspector] public float harmNumber = 0; // 伤害 public float HarmNumber