Merge branch 'main' of http://shu.sheziwanglo.cn:3000/shurongsen/Cute_demon_attacks

meng_yao/Assets/Config/MengYaoSkill.json

@@ -88,25 +88,25 @@
         "monster_code": "土萌妖-02",
         "skills": [
             {
-                "positioning": "快速射出子弹，增加对空伤害",
+                "positioning": "增加散射的子弹数量，对空中单位有更多伤害",
-                "name": "寒冰子弹",
+                "name": "飞散宝石",
                 "effects": {
-                    "level_1": "攻击CD减少25%",
+                    "level_1": "对空中的敌人额外造成30%伤害",
                     "level_2": "伤害提升15%",
-                    "level_3": "增加子弹20%飞行速度，射程减少1格",
+                    "level_3": "攻击CD减少25%，散射角度增加25%，射程减少1格",
                     "level_4": "伤害提升35%",
-                    "level_5": "对攻击减速的敌人造成额外30%伤害，攻击CD增加5%"
+                    "level_5": "子弹飞行速度增加25%，射程减少1格"
                 }
             },
             {
-                "positioning": "增加对空debuff，对小型怪伤害加强",
+                "positioning": "对地面单位伤害加强",
-                "name": "冰霜风暴",
+                "name": "锐利宝石",
                 "effects": {
-                    "level_1": "攻击CD减少25%",
+                    "level_1": "对地面敌人造成额外30%伤害",
                     "level_2": "伤害提升15%",
-                    "level_3": "对小型敌人增加25%伤害，射程减少1格",
+                    "level_3": "攻击CD减少15%，但散射角度更大",
                     "level_4": "伤害提升35%",
-                    "level_5": "每次攻击增加20%暴击率，攻击CD增加5%"
+                    "level_5": "对减速目标造成额外20%伤害，攻击CD增加5%"
                 }
             }
         ]

meng_yao/Assets/Prefabs/charatar/cs.prefab

@@ -411,7 +411,7 @@ GameObject:
   - component: {fileID: 8433650274028726420}
   - component: {fileID: -3836672401185760439}
   - component: {fileID: 1608620729910401442}
-  - component: {fileID: 3258498600701209889}
+  - component: {fileID: 240639004111058784}
   m_Layer: 0
   m_Name: cs
   m_TagString: Player
@@ -506,7 +506,7 @@ MonoBehaviour:
   normalIndex: 0
   isHit: 0
   myTags: 0
-  mySkillUp: {fileID: 3258498600701209889}
+  mySkillUp: {fileID: 240639004111058784}
   IsDead: 0
   HaveDieTime: 0
   enemyId: 
@@ -562,7 +562,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   tower: {fileID: 0}
   Tag: tower
---- !u!114 &3258498600701209889
+--- !u!114 &240639004111058784
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -571,7 +571,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: 95b03e0e868ee84449f3fbfa7423a3a5, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   retbutton: {fileID: 0}

meng_yao/Assets/Prefabs/ui/scene_main/card_huhuhu.prefab

@@ -360,7 +360,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mengyaoid: M_H_001
-  shuxing: 0
+  shuxing: 3
 --- !u!1 &1126466392997513758
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Prefabs/ui/scene_main/card_mkl.prefab

@@ -512,7 +512,7 @@ MonoBehaviour:
   cardIconImage: {fileID: 6655435213110775794}
   cardicon: {fileID: 21300000, guid: 5e3fd295650deeb4fa3395de2d789b8a, type: 3}
   targetTag: tower
-  mengyaoPrefab: {fileID: 8433650275485930554, guid: 0e629856be1575e4a9258394dee87cc7, type: 3}
+  mengyaoPrefab: {fileID: 8433650275485930554, guid: 4f81cc16b1203d549b927ed7da53fdbf, type: 3}
   mask: {fileID: 6655435212345104648}
   mY: {fileID: 0}
 --- !u!114 &6655435211444829444
@@ -528,7 +528,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mengyaoid: M_M_001
-  shuxing: 0
+  shuxing: 1
 --- !u!1 &6655435213110775788
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Prefabs/ui/scene_main/card_qie.prefab

@@ -442,7 +442,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   mengyaoid: M_S_001
-  shuxing: 0
+  shuxing: 2
 --- !u!1 &5508436328304430213
 GameObject:
   m_ObjectHideFlags: 0

meng_yao/Assets/Resources/animation/A_fightin/changshuAni/Stand/cs_Attack.anim

@@ -122,4 +122,11 @@ AnimationClip:
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
-  m_Events: []
+  m_Events:
+  - time: 0.43333334
+    functionName: ShootBullet
+    data: 
+    objectReferenceParameter: {fileID: 0}
+    floatParameter: 0
+    intParameter: 0
+    messageOptions: 0

meng_yao/Assets/common

@@ -1 +1 @@
-Subproject commit d198bb4790e69c80f7e7eb16e112fbf45d58243b
+Subproject commit e828d3c14c03d86a77a12cf184c547257c08f849

meng_yao/Assets/script/A_Fight/CharacterClick.cs

@@ -93,6 +93,7 @@ public class CharacterClick : MonoBehaviour
 
             instantiatedPanel.GetComponent<charainfoPanel>().closeBtn.onClick.AddListener(() => {
                 HideInfoPanel();
+                HideAttackRange(UIContorl.instance.NowAttackRange);
             });
             RectTransform panelRect = instantiatedPanel.GetComponent<RectTransform>();
             // 确保生成的面板不会挡住父物体
@@ -156,7 +157,7 @@ public class CharacterClick : MonoBehaviour
             Destroy(instantiatedPanel.GetComponent<charainfoPanel>()._closePanel);
         }
        
-        HideAttackRange(UIContorl.instance.NowAttackRange);
+       
         //Debug.Log("关闭攻击范围");
     }
 }

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

@@ -0,0 +1,59 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class cs_SkillUp : SkillUp
+{
+    /// <summary>
+    ///对空中的敌人额外造成30%伤害
+    /// </summary>
+    public override void Skill_1_1()
+    {
+        base.DamageOfSky+=0.3f;
+    }
+    /// <summary>
+    /// 攻击CD减少25%，散射角度增加25%，射程减少1格
+    /// </summary>
+    public override void Skill_1_3()
+    {
+       
+        AttackCooldown -= 0.25f;
+        base.AttackRange = -1;
+        attack.SetAttackRange();
+    }
+    /// <summary>
+    /// 子弹飞行速度增加25%，射程减少1格"
+    /// </summary>
+    public override void Skill_1_5()
+    {
+        base.speedOfBullets+=0.25f;
+        base.AttackRange = -1;
+        attack.SetAttackRange();
+    }
+
+
+    /// <summary>
+    /// 对地面敌人造成额外30%伤害
+    /// </summary>
+    public override void Skill_2_1()
+    {
+        base.AttackCooldown += -0.25f;
+    }
+    /// <summary>
+    /// 攻击CD减少15%，但散射角度更大
+    /// </summary>
+    public override void Skill_2_3()
+    {
+        base.DamageOfMin += 0.25f;
+        base.AttackRange = -1;
+        attack.SetAttackRange();
+    }
+    /// <summary>
+    /// 对减速目标造成额外20%伤害，攻击CD增加5%
+    /// </summary>
+    public override void Skill_2_5()
+    {
+        base.CriticalRate += 0.2f;
+        base.AttackCooldown += 0.05f;
+    }
+}

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

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