木蘑菇完成

meng_yao/Assets/Prefabs/charatar/mmg.prefab

@@ -361,7 +361,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 90e9cd2fc0a74084fbf1a89015db94a9, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  bulletPrefab: {fileID: 900173028918561104, guid: 99830c598e775fb42b39abf253c5f084, type: 3}
+  bulletPrefab: {fileID: 900173028918561104, guid: c7974614ec6f2d049b979213fb16ada5, type: 3}
   role: {fileID: 8433650274028726420}
   damageTyp: 2
   attackCooldown: 1
@@ -414,7 +414,7 @@ GameObject:
   - component: {fileID: 8433650274028726420}
   - component: {fileID: -3836672401185760439}
   - component: {fileID: 1608620729910401442}
-  - component: {fileID: 3258498600701209889}
+  - component: {fileID: 8431660328256440042}
   m_Layer: 0
   m_Name: mmg
   m_TagString: Player
@@ -509,7 +509,7 @@ MonoBehaviour:
   normalIndex: 0
   isHit: 0
   myTags: 0
-  mySkillUp: {fileID: 3258498600701209889}
+  mySkillUp: {fileID: 8431660328256440042}
   IsDead: 0
   HaveDieTime: 0
   enemyId: 
@@ -566,7 +566,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   tower: {fileID: 0}
   Tag: tower
---- !u!114 &3258498600701209889
+--- !u!114 &8431660328256440042
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -575,7 +575,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 8433650275485930554}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cf06a056a8f837740a4fca76de3a5ed5, type: 3}
+  m_Script: {fileID: 11500000, guid: 4343d5a9d3f9c4246bb691da4aaa144d, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   retbutton: {fileID: 0}

meng_yao/Assets/Resources/animation/A_fightin/mmg_Ani/Stand/mmg_Attack.anim

@@ -154,7 +154,7 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_Events:
   - time: 0.73333335
-    functionName: ShootBullet
+    functionName: ShanXingAttack
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 0

meng_yao/Assets/Scenes/scene_Main.unity

@@ -31606,27 +31606,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: 3011360593759919820, guid: a8cc81ed2c5736a46a14628d8d489ac4, type: 3}
       propertyPath: m_AnchorMax.y

meng_yao/Assets/common

@@ -1 +1 @@
-Subproject commit f1d8219300474f47b57fcf3d3867062dfde97d80
+Subproject commit 5788bda1d2bc278bb1ab1a288344c13c16db84a0

meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs

@@ -0,0 +1,59 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class mmg_SkillUp : SkillUp
+{
+    /// <summary>
+    ///攻击CD减少25%
+    /// </summary>
+    public override void Skill_1_1()
+    {
+        base.AttackCooldown -= 0.25f;
+       
+    }
+    /// <summary>
+    /// 射程提升2格位置，攻击CD增加5%
+    /// </summary>
+    public override void Skill_1_3()
+    {
+       
+        AttackCooldown += 0.05f;
+        base.AttackRange = 2;
+        attack.SetAttackRange();
+    }
+    /// <summary>
+    /// 增加子弹20%飞行速度，攻击CD增加5%
+    /// </summary>
+    public override void Skill_1_5()
+    {
+        AttackCooldown += 0.05f;
+        base.attack.roleBulletSpeedAdd += 0.2f;
+    }
+
+
+    /// <summary>
+    /// 每次射击2个子弹，增加扇形攻击范围
+    /// </summary>
+    public override void Skill_2_1()
+    {
+        base.attack.BulletNumber += 2;
+        base.attack.Angle += 20;
+    }
+    /// <summary>
+    /// 对小型敌人增加25%伤害，攻击CD增加5%
+    /// </summary>
+    public override void Skill_2_3()
+    {
+        base.DamageOfMin += 0.25f;
+        AttackCooldown += 0.05f;
+    }
+    /// <summary>
+    /// 对小型敌人增加40%伤害，攻击CD增加5%
+    /// </summary>
+    public override void Skill_2_5()
+    {
+        base.DamageOfMin += 0.4f;
+        base.AttackCooldown += 0.05f;
+    }
+}

meng_yao/Assets/script/A_Fight/SkillUp/mmg_SkillUp.cs.meta

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