漏传

ActionTowerDefense/Assets/GameLevelEditor/GameMap/CoreScripts/GameMapTile.cs

@@ -16,8 +16,8 @@ public struct Parameter
 	public int HP;
 	public float MinMoveSpeed;
 	public float MaxMoveSpeed;
-	public int attack_summon;
-	public int attack_march;
+	public int Attack_summon;
+	public int Attack_march;
 }
 
 

ActionTowerDefense/Assets/Gen/SingleEnemyConfig.cs

@@ -21,20 +21,20 @@ public sealed partial class SingleEnemyConfig :  Bright.Config.BeanBase
         { if(!_json["ID"].IsNumber) { throw new SerializationException(); }  ID = _json["ID"]; }
         { if(!_json["EnemyPrefab"].IsString) { throw new SerializationException(); }  EnemyPrefab = _json["EnemyPrefab"]; }
         { if(!_json["HP"].IsNumber) { throw new SerializationException(); }  HP = _json["HP"]; }
-        { var __json0 = _json["attack_summon"]; if(!__json0.IsArray) { throw new SerializationException(); } attack_summon = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  attack_summon.Add(__v0); }   }
-        { var __json0 = _json["attack_march"]; if(!__json0.IsArray) { throw new SerializationException(); } attack_march = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  attack_march.Add(__v0); }   }
+        { var __json0 = _json["Attack_summon"]; if(!__json0.IsArray) { throw new SerializationException(); } Attack_summon = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  Attack_summon.Add(__v0); }   }
+        { var __json0 = _json["Attack_march"]; if(!__json0.IsArray) { throw new SerializationException(); } Attack_march = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  Attack_march.Add(__v0); }   }
         { if(!_json["MinMoveSpeed"].IsNumber) { throw new SerializationException(); }  MinMoveSpeed = _json["MinMoveSpeed"]; }
         { if(!_json["MaxMoveSpeed"].IsNumber) { throw new SerializationException(); }  MaxMoveSpeed = _json["MaxMoveSpeed"]; }
         PostInit();
     }
 
-    public SingleEnemyConfig(int ID, string EnemyPrefab, int HP, System.Collections.Generic.List<int> attack_summon, System.Collections.Generic.List<int> attack_march, float MinMoveSpeed, float MaxMoveSpeed ) 
+    public SingleEnemyConfig(int ID, string EnemyPrefab, int HP, System.Collections.Generic.List<int> Attack_summon, System.Collections.Generic.List<int> Attack_march, float MinMoveSpeed, float MaxMoveSpeed ) 
     {
         this.ID = ID;
         this.EnemyPrefab = EnemyPrefab;
         this.HP = HP;
-        this.attack_summon = attack_summon;
-        this.attack_march = attack_march;
+        this.Attack_summon = Attack_summon;
+        this.Attack_march = Attack_march;
         this.MinMoveSpeed = MinMoveSpeed;
         this.MaxMoveSpeed = MaxMoveSpeed;
         PostInit();
@@ -58,13 +58,13 @@ public sealed partial class SingleEnemyConfig :  Bright.Config.BeanBase
     /// </summary>
     public int HP { get; private set; }
     /// <summary>
-    /// attack_summon攻击力
+    /// Attack_summon攻击力
     /// </summary>
-    public System.Collections.Generic.List<int> attack_summon { get; private set; }
+    public System.Collections.Generic.List<int> Attack_summon { get; private set; }
     /// <summary>
-    /// attack_march攻击力
+    /// Attack_march攻击力
     /// </summary>
-    public System.Collections.Generic.List<int> attack_march { get; private set; }
+    public System.Collections.Generic.List<int> Attack_march { get; private set; }
     /// <summary>
     /// 最小移动速度
     /// </summary>
@@ -92,8 +92,8 @@ public sealed partial class SingleEnemyConfig :  Bright.Config.BeanBase
         + "ID:" + ID + ","
         + "EnemyPrefab:" + EnemyPrefab + ","
         + "HP:" + HP + ","
-        + "attack_summon:" + Bright.Common.StringUtil.CollectionToString(attack_summon) + ","
-        + "attack_march:" + Bright.Common.StringUtil.CollectionToString(attack_march) + ","
+        + "Attack_summon:" + Bright.Common.StringUtil.CollectionToString(Attack_summon) + ","
+        + "Attack_march:" + Bright.Common.StringUtil.CollectionToString(Attack_march) + ","
         + "MinMoveSpeed:" + MinMoveSpeed + ","
         + "MaxMoveSpeed:" + MaxMoveSpeed + ","
         + "}";

ActionTowerDefense/Assets/Scripts/Character.cs

@@ -106,14 +106,14 @@ public class Character : MonoBehaviour
     [HideInInspector]
     public bool isNonAttack = false;            //无普攻
     public float attackTime;
-    public float totalAttack1Time = 0.5f;
-    public float totalAttack2Time = 0.5f;
+    public float totalAttack_summonTime = 0.5f;
+    public float totalAttack_marchTime = 0.5f;
     public AttackType attackType;               //攻击类型
     public GameObject bulletPrefab;             //远程攻击的子弹
     public List<Transform> shootPos;            //远程攻击的子弹发射位置
     public bool shootTrack = false;             //远程攻击是否追踪目标
-    public List<AttackInfo> attack1Infos;       //普攻1信息（出场攻击）
-    public List<AttackInfo> attack2Infos;       //普攻2信息
+    public List<AttackInfo> Attack_summonInfos;       //普攻1信息（出场攻击）
+    public List<AttackInfo> Attack_marchInfos;       //普攻2信息
     public List<AttackTrigger> attackTriggers;  //普攻触发器，敌方进入后播放动画进行攻击
     public GameObject addAttackEffect;
     public int armorPiercing;                   //穿甲率
@@ -149,7 +149,7 @@ public class Character : MonoBehaviour
     public GameObject cookEffect;       //吃串加血
 
     [Header("传送门")]
-    public bool attack1ShootCanTransmit;    //普攻1弓箭可以被传送
+    public bool Attack_summonShootCanTransmit;    //普攻1弓箭可以被传送
 
     //调试开关
     [Header("debug攻击者")] public bool debugAttackFrom;
@@ -192,15 +192,15 @@ public class Character : MonoBehaviour
         {
             rope = null;
         }
-        curDamage1 = new int[attack1Infos.Count];
-        for (int i = 0; i < attack1Infos.Count; i++)
+        curDamage1 = new int[Attack_summonInfos.Count];
+        for (int i = 0; i < Attack_summonInfos.Count; i++)
         {
-            curDamage1[i] = attack1Infos[i].damage;
+            curDamage1[i] = Attack_summonInfos[i].damage;
         }
-        curDamage2 = new int[attack2Infos.Count];
-        for (int i = 0; i < attack2Infos.Count; i++)
+        curDamage2 = new int[Attack_marchInfos.Count];
+        for (int i = 0; i < Attack_marchInfos.Count; i++)
         {
-            curDamage2[i] = attack2Infos[i].damage;
+            curDamage2[i] = Attack_marchInfos[i].damage;
         }
     }
 
@@ -277,11 +277,11 @@ public class Character : MonoBehaviour
         AttackInfo attackInfo;
         if (attackId == 1)
         {
-            attackInfo = attack1Infos[shootId];
+            attackInfo = Attack_summonInfos[shootId];
         }
         else
         {
-            attackInfo = attack2Infos[shootId];
+            attackInfo = Attack_marchInfos[shootId];
             attackInfo.damage = curDamage2[0];
         }
         GameObject bulletObj = PoolManager.Instantiate(bulletPrefab);
@@ -291,7 +291,7 @@ public class Character : MonoBehaviour
         {
             attackDir.x = -attackDir.x;
         }
-        if (attackId == 1 && attack1ShootCanTransmit)
+        if (attackId == 1 && Attack_summonShootCanTransmit)
         {
             bullet.canTransmit = true;
         }
@@ -304,27 +304,27 @@ public class Character : MonoBehaviour
         return moveDir;
     }
 
-    public virtual void attack_summon()
+    public virtual void Attack_summon()
     {
-        ani.Play("attack_summon", 0, 0);
+        ani.Play("Attack_summon", 0, 0);
         if (!isNonAttack)
         {
-            aniCollider.Play("attack_summon", 1, 0);
-            attackTime = totalAttack1Time;
+            aniCollider.Play("Attack_summon", 1, 0);
+            attackTime = totalAttack_summonTime;
             switch (attackType)
             {
                 case AttackType.Melee:
-                    for (int i = 0; i < attack1Infos.Count; i++)
+                    for (int i = 0; i < Attack_summonInfos.Count; i++)
                     {
                         attackTriggers[i].damage = curDamage1[i];
-                        attackTriggers[i].changeHurt = attack1Infos[i].changeHurt;
-                        attackTriggers[i].repelValue = attack1Infos[i].repelValue;
-                        Vector3 attackDir = attack1Infos[i].attackDir.normalized;
+                        attackTriggers[i].changeHurt = Attack_summonInfos[i].changeHurt;
+                        attackTriggers[i].repelValue = Attack_summonInfos[i].repelValue;
+                        Vector3 attackDir = Attack_summonInfos[i].attackDir.normalized;
                         if (bodyTrans.localScale.x < 0)
                         {
                             attackDir.x = -attackDir.x;
                         }
-                        attackTriggers[i].force = attackDir * attack1Infos[i].force;
+                        attackTriggers[i].force = attackDir * Attack_summonInfos[i].force;
                     }
                     break;
                 case AttackType.Shoot:
@@ -338,7 +338,7 @@ public class Character : MonoBehaviour
         }
     }
 
-    public virtual void attack_march()
+    public virtual void Attack_march()
     {
         Vector3 leftDir = GetMoveDir();
         if (leftDir.x > 0.3f)
@@ -356,22 +356,22 @@ public class Character : MonoBehaviour
             }
         }
 
-        ani.Play("attack_march", 0, 0);
-        aniCollider.Play("attack_march", 1, 0);
-        attackTime = totalAttack2Time;
+        ani.Play("Attack_march", 0, 0);
+        aniCollider.Play("Attack_march", 1, 0);
+        attackTime = totalAttack_marchTime;
         if (attackTriggers.Count > 0)
         {
-            for (int i = 0; i < attack2Infos.Count; i++)
+            for (int i = 0; i < Attack_marchInfos.Count; i++)
             {
                 attackTriggers[i].damage = curDamage2[i];
-                attackTriggers[i].changeHurt = attack2Infos[i].changeHurt;
-                attackTriggers[i].repelValue = attack2Infos[i].repelValue;
-                Vector3 attackDir = attack2Infos[i].attackDir.normalized;
+                attackTriggers[i].changeHurt = Attack_marchInfos[i].changeHurt;
+                attackTriggers[i].repelValue = Attack_marchInfos[i].repelValue;
+                Vector3 attackDir = Attack_marchInfos[i].attackDir.normalized;
                 if (bodyTrans.localScale.x < 0)
                 {
                     attackDir.x = -attackDir.x;
                 }
-                attackTriggers[i].force = attackDir * attack2Infos[i].force;
+                attackTriggers[i].force = attackDir * Attack_marchInfos[i].force;
             }
         }
 

ActionTowerDefense/Assets/Scripts/CharacterColliders.cs

@@ -18,7 +18,7 @@ public class CharacterColliders : MonoBehaviour
 
     }
 
-    public void Attack1ShootEvent(int shootId)
+    public void Attack_summonShootEvent(int shootId)
     {
         if (owner == null)
         {
@@ -27,7 +27,7 @@ public class CharacterColliders : MonoBehaviour
         owner.AttackShootEvent(1, shootId);
     }
 
-    public void Attack2ShootEvent(int shootId)
+    public void Attack_marchShootEvent(int shootId)
     {
         if (smoke != null && smoke.activeSelf)
         {

ActionTowerDefense/Assets/Scripts/Demonic.cs

@@ -310,7 +310,7 @@ public class Demonic : MoveCharacter
             case CharacterState.Idle:
                 if (isAttack)
                 {
-                    attack_march();
+                    Attack_march();
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -346,7 +346,7 @@ public class Demonic : MoveCharacter
             case CharacterState.Run:
                 if (isAttack)
                 {
-                    attack_march();
+                    Attack_march();
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -406,7 +406,7 @@ public class Demonic : MoveCharacter
             case CharacterState.Rush:
                 if (isAttack)
                 {
-                    attack_march();
+                    Attack_march();
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -837,9 +837,9 @@ public class Demonic : MoveCharacter
         }
     }
 
-    public override void attack_summon()
+    public override void Attack_summon()
     {
-        base.attack_summon();
+        base.Attack_summon();
         Vector3 moveDir;
         if (PlayersInput.instance[playerID].bodyTrans.localScale.x > 0)
         {
@@ -863,13 +863,13 @@ public class Demonic : MoveCharacter
                 Turn();
             }
         }
-        invincibleTime = totalAttack1Time;
+        invincibleTime = totalAttack_summonTime;
         attackTarget = targetCharacter;
     }
 
-    public override void attack_march()
+    public override void Attack_march()
     {
-        base.attack_march();
+        base.Attack_march();
         attackTarget = targetCharacter;
     }
 

ActionTowerDefense/Assets/Scripts/Enemy.cs

@@ -288,7 +288,7 @@ public class Enemy : MoveCharacter
             case CharacterState.Idle:
                 if (isAttack)
                 {
-                    attack_march();
+                    Attack_march();
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -324,7 +324,7 @@ public class Enemy : MoveCharacter
             case CharacterState.Run:
                 if (isAttack)
                 {
-                    attack_march();
+                    Attack_march();
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -375,7 +375,7 @@ public class Enemy : MoveCharacter
             case CharacterState.Rush:
                 if (isAttack)
                 {
-                    attack_march();
+                    Attack_march();
                     break;
                 }
                 if (!foot.TrigGround && !canFly)
@@ -1124,15 +1124,15 @@ public class Enemy : MoveCharacter
         }
     }
 
-    public override void attack_summon()
+    public override void Attack_summon()
     {
-        base.attack_summon();
+        base.Attack_summon();
         attackTarget = targetCharacter;
     }
 
-    public override void attack_march()
+    public override void Attack_march()
     {
-        base.attack_march();
+        base.Attack_march();
         attackTarget = targetCharacter;
     }
     public void ChosePlayer()

ActionTowerDefense/Assets/Scripts/EnemyCreater.cs

@@ -162,9 +162,9 @@ public class EnemyCreater : MonoBehaviour
                     enemyTower.totalHp = (int)(parameter.HP * hpRatio);
                     enemyTower.hp = enemyTower.totalHp;
 
-                    attackInfo = enemyTower.attack1Infos[0];
-                    attackInfo.damage = (int)(parameter.attack_summon * attackRatio);
-                    enemyTower.attack1Infos[0] = attackInfo;
+                    attackInfo = enemyTower.Attack_summonInfos[0];
+                    attackInfo.damage = (int)(parameter.Attack_summon * attackRatio);
+                    enemyTower.Attack_summonInfos[0] = attackInfo;
                     enemyTower.Init();
                 }
                 if (tower != null)
@@ -174,9 +174,9 @@ public class EnemyCreater : MonoBehaviour
                     tower.totalHp = (int)(parameter.HP * hpRatio);
                     tower.hp = tower.totalHp;
 
-                    attackInfo = enemyTower.attack1Infos[0];
-                    attackInfo.damage = (int)(parameter.attack_summon * attackRatio);
-                    tower.attack1Infos[0] = attackInfo;
+                    attackInfo = enemyTower.Attack_summonInfos[0];
+                    attackInfo.damage = (int)(parameter.Attack_summon * attackRatio);
+                    tower.Attack_summonInfos[0] = attackInfo;
                     tower.Init();
                 }
                 if (!buildingDic.ContainsKey(gameMapTile.id))
@@ -199,13 +199,13 @@ public class EnemyCreater : MonoBehaviour
                 enemy.hp = enemy.totalHp;
                 enemy.minMoveSpeed = parameter.MinMoveSpeed;
                 enemy.maxMoveSpeed = parameter.MaxMoveSpeed;
-                attackInfo = enemy.attack1Infos[0];
-                attackInfo.damage = (int)(parameter.attack_summon * attackRatio);
-                enemy.attack1Infos[0] = attackInfo;
+                attackInfo = enemy.Attack_summonInfos[0];
+                attackInfo.damage = (int)(parameter.Attack_summon * attackRatio);
+                enemy.Attack_summonInfos[0] = attackInfo;
 
-                attackInfo = enemy.attack2Infos[0];
-                attackInfo.damage = (int)(parameter.attack_march * attackRatio);
-                enemy.attack2Infos[0] = attackInfo;
+                attackInfo = enemy.Attack_marchInfos[0];
+                attackInfo.damage = (int)(parameter.Attack_march * attackRatio);
+                enemy.Attack_marchInfos[0] = attackInfo;
 
                 if (enemy.canFly)
                 {

ActionTowerDefense/Assets/Scripts/EnemyTower.cs

@@ -54,7 +54,7 @@ public class EnemyTower : Character
             case CharacterState.Idle:
                 if (isAttack)
                 {
-                    attack_summon();
+                    Attack_summon();
                     break;
                 }
                 break;

ActionTowerDefense/Assets/Scripts/PlayerController.cs

@@ -1052,7 +1052,7 @@ public class PlayerController : MoveCharacter
             //{
             //    if (excludeState != CharacterState.Attack)
             //    {
-            //        attack_summon();
+            //        Attack_summon();
             //        return true;
             //    }
             //}
@@ -1945,10 +1945,10 @@ public class PlayerController : MoveCharacter
                 rb.velocity = Vector3.zero;
                 break;
             case CharacterState.Attack:
-                attackTime = totalAttack1Time;
+                attackTime = totalAttack_summonTime;
                 break;
             case CharacterState.KeepAttack:
-                aniCollider.Play("Attack1Keep", 1, 0);
+                aniCollider.Play("Attack_summonKeep", 1, 0);
                 break;
             case CharacterState.Summon:
                 aniCollider.Play("Summon", 0, 0);
@@ -2214,7 +2214,7 @@ public class PlayerController : MoveCharacter
         demonic.SetSortingOrder(order);
         if (id != 4)
         {
-            demonic.attack_summon();
+            demonic.Attack_summon();
         }
         //id 3~6 ΪËĸöÓ¢Áé
         if (id >= 3 && id <= 6)
@@ -2271,9 +2271,9 @@ public class PlayerController : MoveCharacter
         return true;
     }
 
-    public override void attack_summon()
+    public override void Attack_summon()
     {
-        base.attack_summon();
+        base.Attack_summon();
         if (leftDir.x > 0.3f)
         {
             if (bodyTrans.localScale.x > 0)
@@ -2300,7 +2300,7 @@ public class PlayerController : MoveCharacter
     {
         attackState = value;
         ani.SetInteger("attackState", (int)value);
-        aniCollider.Play("Attack1Keep", 1, 0);
+        aniCollider.Play("Attack_summonKeep", 1, 0);
     }
 
     public void SearchTarget()

ActionTowerDefense/Assets/Scripts/Spirits/DashEffect.cs

@@ -23,11 +23,11 @@ public class DashEffect : MonoBehaviour
         {
             if (isEnemy)
             {
-                attackInfo = GetComponentInParent<Enemy>().attack1Infos[0];
+                attackInfo = GetComponentInParent<Enemy>().Attack_summonInfos[0];
             }
             else
             {
-                attackInfo = GetComponentInParent<Demonic>().attack1Infos[0];
+                attackInfo = GetComponentInParent<Demonic>().Attack_summonInfos[0];
             }
         }
     }

ActionTowerDefense/Assets/Scripts/Spirits/ESpirits_Cook.cs

@@ -72,7 +72,7 @@ public class ESpirits_Cook : MonoBehaviour
                         isInterval = true;
                         chuan -= 1;
                         text.text = chuan.ToString();
-                        ani.Play("attack_march", 0, 0);
+                        ani.Play("Attack_march", 0, 0);
                         if (target.cookEffect == null)
                         {
                             target.cookEffect = Instantiate(effect, target.transform.position, new Quaternion(0, 0, 0, 0), target.transform);

ActionTowerDefense/Assets/Scripts/Spirits/Trans_Assassin.cs

@@ -77,7 +77,7 @@ public class Trans_Assassin : MonoBehaviour
             case Trans_AssassinState.Rush:
                 dashEffect.canHit = true;
                 aimEffect.SetActive(false);
-                player.ani.Play("attack_summon", 0, 0);
+                player.ani.Play("Attack_summon", 0, 0);
                 Rush();
                 time += Time.deltaTime;
                 if (time >= rushTime)
@@ -130,7 +130,7 @@ public class Trans_Assassin : MonoBehaviour
             case Trans_AssassinState.SecondRush:
                 dashEffect.canHit = true;
                 aimEffect.SetActive(false);
-                player.ani.Play("attack_summon", 0, 0);
+                player.ani.Play("Attack_summon", 0, 0);
                 Rush();
                 time += Time.deltaTime;
                 if (time >= rushTime)

ActionTowerDefense/Assets/Scripts/Tower.cs

@@ -42,7 +42,7 @@ public class Tower : Character
             case CharacterState.Idle:
                 if (isAttack)
                 {
-                    attack_summon();
+                    Attack_summon();
                     break;
                 }
                 break;