浏览代码

使魔和怪物归到同一层级,Enemy的层级放到Prefab上

wulifu 1 年之前
父节点
当前提交
d174165ce5

+ 1 - 8
ActionTowerDefense/Assets/Gen/SingleEnemyConfig.cs

@@ -23,18 +23,16 @@ public sealed partial class SingleEnemyConfig :  Bright.Config.BeanBase
         { if(!_json["HP"].IsNumber) { throw new SerializationException(); }  HP = _json["HP"]; }
         { var __json0 = _json["Attack1"]; if(!__json0.IsArray) { throw new SerializationException(); } Attack1 = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  Attack1.Add(__v0); }   }
         { var __json0 = _json["Attack2"]; if(!__json0.IsArray) { throw new SerializationException(); } Attack2 = new System.Collections.Generic.List<int>(__json0.Count); foreach(JSONNode __e0 in __json0.Children) { int __v0;  { if(!__e0.IsNumber) { throw new SerializationException(); }  __v0 = __e0; }  Attack2.Add(__v0); }   }
-        { if(!_json["SortingOrder"].IsNumber) { throw new SerializationException(); }  SortingOrder = _json["SortingOrder"]; }
         PostInit();
     }
 
-    public SingleEnemyConfig(int ID, string EnemyPrefab, int HP, System.Collections.Generic.List<int> Attack1, System.Collections.Generic.List<int> Attack2, int SortingOrder ) 
+    public SingleEnemyConfig(int ID, string EnemyPrefab, int HP, System.Collections.Generic.List<int> Attack1, System.Collections.Generic.List<int> Attack2 ) 
     {
         this.ID = ID;
         this.EnemyPrefab = EnemyPrefab;
         this.HP = HP;
         this.Attack1 = Attack1;
         this.Attack2 = Attack2;
-        this.SortingOrder = SortingOrder;
         PostInit();
     }
 
@@ -63,10 +61,6 @@ public sealed partial class SingleEnemyConfig :  Bright.Config.BeanBase
     /// Attack2攻击力
     /// </summary>
     public System.Collections.Generic.List<int> Attack2 { get; private set; }
-    /// <summary>
-    /// 基础显示层级(1000递增)
-    /// </summary>
-    public int SortingOrder { get; private set; }
 
     public const int __ID__ = 491839330;
     public override int GetTypeId() => __ID__;
@@ -88,7 +82,6 @@ public sealed partial class SingleEnemyConfig :  Bright.Config.BeanBase
         + "HP:" + HP + ","
         + "Attack1:" + Bright.Common.StringUtil.CollectionToString(Attack1) + ","
         + "Attack2:" + Bright.Common.StringUtil.CollectionToString(Attack2) + ","
-        + "SortingOrder:" + SortingOrder + ","
         + "}";
     }
     

+ 19 - 1
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Arrow.prefab

@@ -576,6 +576,7 @@ MonoBehaviour:
   owner: {fileID: 0}
   isCook: 0
   trigObjList: []
+  cook: {fileID: 0}
   needToChange: 1
   maxLen: 45
   minLen: 35
@@ -967,7 +968,6 @@ MonoBehaviour:
   - {fileID: 5388987656270167698}
   - {fileID: 1190225091429982147}
   cookNum: 3
-  cooks: []
   mecanim: {fileID: 3354085511906294621}
   meshRenderer: {fileID: 0}
   ani: {fileID: 5978259926173120695}
@@ -1030,6 +1030,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 1
   foot: {fileID: 8639832132450015562}
   extraRiseGravity: -28.8
@@ -1052,8 +1053,24 @@ MonoBehaviour:
   minRotateSpeed: 5
   floatTime: 20
   floatState: 0
+  spinee: {fileID: 0}
+  mesh: {fileID: 0}
+  mats: []
   outlineMats:
   - {fileID: 2100000, guid: b634d447d9a02a14abc964532eedfc35, type: 2}
+  playerMe: {fileID: 0}
+  playerAni: {fileID: 0}
+  playerCol: {fileID: 0}
+  playerTran: {fileID: 0}
+  playerBst: {fileID: 0}
+  playerBullet: {fileID: 0}
+  playerST: {fileID: 0}
+  playerFoot: {fileID: 0}
+  playerSpinee: {fileID: 0}
+  playerMesh: {fileID: 0}
+  playerMats: []
+  playerOut: []
+  isInvisible: 0
   id: 0
   jumpSpeed: 10
   searchState: 0
@@ -1064,6 +1081,7 @@ MonoBehaviour:
   canFly: 1
   flyHeight: 0
   flyUpSpeed: 10
+  sortingOrder: 2000
   attackRatio: 0
   maxMoveSpeed: 12
   minMoveSpeed: 8

+ 2 - 0
ActionTowerDefense/Assets/Resources/Prefab/Enemy_Sword.prefab

@@ -277,6 +277,7 @@ MonoBehaviour:
   rope: {fileID: 0}
   hasHpUp: 0
   beLarger: 0
+  attackToFloat: 0
   canMove: 1
   foot: {fileID: 2437299196663985756}
   extraRiseGravity: -28.8
@@ -327,6 +328,7 @@ MonoBehaviour:
   canFly: 0
   flyHeight: 0
   flyUpSpeed: 10
+  sortingOrder: 1000
   attackRatio: 0
   maxMoveSpeed: 6
   minMoveSpeed: 5

+ 1 - 0
ActionTowerDefense/Assets/Scripts/Enemy.cs

@@ -34,6 +34,7 @@ public class Enemy : MoveCharacter
     public bool canFly = false;
     public float flyHeight;
     public float flyUpSpeed = 10;
+    public int sortingOrder = 0;
 
     public float attackRatio;
     public float maxMoveSpeed, minMoveSpeed;

+ 5 - 2
ActionTowerDefense/Assets/Scripts/EnemyCreater.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using cfg;
 using System.Threading.Tasks;
 using Base.Common;
+using System.IO;
 
 public class EnemyCreater : MonoBehaviour
 {
@@ -92,7 +93,9 @@ public class EnemyCreater : MonoBehaviour
             enemy.flyHeight = enemy.transform.position.y;
         }
         enemy.Init();
-        enemy.SetSortingOrder(cfgEnemy.SortingOrder + enemyDic[enemyId].Count);
+        GameObject prefab = Resources.Load<GameObject>(cfgEnemy.EnemyPrefab);
+        int sortingOrder = prefab.GetComponent<Enemy>().sortingOrder;
+        enemy.SetSortingOrder(sortingOrder + enemyDic[enemyId].Count);
     }
 
     public void OnEnemyRecycle(Enemy enemy)
@@ -105,7 +108,7 @@ public class EnemyCreater : MonoBehaviour
         SingleEnemyConfig cfgEnemy = GameManager.instance.allCfgData.CfgEnemy.Get(enemy.id);
         for (int i = 0; i < enemyDic[enemy.id].Count; i++)
         {
-            enemyDic[enemy.id][i].SetSortingOrder(cfgEnemy.SortingOrder + i);
+            enemyDic[enemy.id][i].SetSortingOrder(enemy.id * 1000 + i);
         }
     }
 

+ 7 - 14
ActionTowerDefense/GenerateDatas/json/cfgenemy.json

@@ -8,8 +8,7 @@
     ],
     "Attack2": [
       100
-    ],
-    "SortingOrder": 0
+    ]
   },
   {
     "ID": 2,
@@ -20,8 +19,7 @@
     ],
     "Attack2": [
       40
-    ],
-    "SortingOrder": 1000
+    ]
   },
   {
     "ID": 3,
@@ -32,8 +30,7 @@
     ],
     "Attack2": [
       110
-    ],
-    "SortingOrder": 2000
+    ]
   },
   {
     "ID": 4,
@@ -44,8 +41,7 @@
     ],
     "Attack2": [
       100
-    ],
-    "SortingOrder": 3000
+    ]
   },
   {
     "ID": 5,
@@ -56,8 +52,7 @@
     ],
     "Attack2": [
       110
-    ],
-    "SortingOrder": 3000
+    ]
   },
   {
     "ID": 6,
@@ -68,8 +63,7 @@
     ],
     "Attack2": [
       100
-    ],
-    "SortingOrder": 3000
+    ]
   },
   {
     "ID": 7,
@@ -80,7 +74,6 @@
     ],
     "Attack2": [
       0
-    ],
-    "SortingOrder": 3000
+    ]
   }
 ]

+ 12 - 12
ActionTowerDefense/Luban/.cache.meta

@@ -1,12 +1,12 @@
-C:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgCreateEnemy.cs,3A9B470F9A1FA351330EA275C82C399,1404,1711769724306
-C:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgEnemy.cs,FDE1CE1B09C67F343EE84B2F88F27A6,1820,1711769724301
-C:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleCreateEnemyConfig.cs,C7FC1E458E49806699423B1E827969,4365,1721724836325
-C:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleEnemyConfig.cs,52D50AA62346441E5CF6FB54B178584,3703,1711769724284
-C:/ActionTowerDefense/ActionTowerDefense/Assets/Gen/Tables.cs,912B477615DA4F7C6B7D4A0EE96B27A,1296,1711769724292
-C:/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy.json,75C73444F16B612FDF9428358877CC,2964,1721102657826
-C:/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,6F18339F1EC1C2978D96D3B85EC1F37C,1299,1721725674985
-C:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__beans__.xlsx,98987DA7288FEE34BCD08EA883D425E,9603,1711190247467
-C:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__enums__.xlsx,647733322F7261DFA483C2DBE2D1F9A4,10293,1711190247467
-C:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__tables__.xlsx,D1BC5823EBCE916872405D2DCDC896D,10232,1711372939546
-C:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/出怪表.xlsx,C7A7DE3AA56896CDA374A8B18BB4181D,10423,1721725129291
-C:/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,E9811AFB63A622F91E989F6D96E13A50,9922,1721726091037
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgCreateEnemy.cs,3A9B470F9A1FA351330EA275C82C399,1404,1711097150748
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Assets/Gen/CfgEnemy.cs,FDE1CE1B09C67F343EE84B2F88F27A6,1820,1711369259455
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleCreateEnemyConfig.cs,C7FC1E458E49806699423B1E827969,4365,1715603297245
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Assets/Gen/SingleEnemyConfig.cs,D5F643F55C5C4765F3F8EFC19A64C96,3343,1721969362811
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Assets/Gen/Tables.cs,912B477615DA4F7C6B7D4A0EE96B27A,1296,1711097150748
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy.json,75C73444F16B612FDF9428358877CC,2964,1721104584477
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,AA9AD8556FD752B4737EC1A91611A5F,1113,1721969362811
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__beans__.xlsx,98987DA7288FEE34BCD08EA883D425E,9603,1711095806628
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__enums__.xlsx,647733322F7261DFA483C2DBE2D1F9A4,10293,1711095790814
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/__tables__.xlsx,D1BC5823EBCE916872405D2DCDC896D,10232,1711369251824
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/出怪表.xlsx,C7A7DE3AA56896CDA374A8B18BB4181D,10423,1721967513401
+H:/UnityProject/ActionTowerDefense/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,FC90192FC35735B3B251C08EA2DC53C,10305,1721969357283

二进制
ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx


+ 2 - 2
ActionTowerDefense/ProjectSettings/TagManager.asset

@@ -18,8 +18,8 @@ TagManager:
   - Water
   - UI
   - Player
-  - Demonic
-  - Enemy
+  - EnemyAndDemonic
+  - 
   - Tower
   - EnemyTower
   - Soul