Ver código fonte

修复了蝌蚪不能由怪物表生成在关卡中以及攻击力不随怪物表更改的bug

Callum 3 meses atrás
pai
commit
07d6c1eda1

+ 3 - 3
ActionTowerDefense/Assets/Resources/Prefab/Enemy/Enemy_Polliwog.prefab

@@ -946,17 +946,17 @@ MonoBehaviour:
   climbSpeed: 0
   playerTarget: {fileID: 0}
   damage: 0
-  separationWeight: 2
+  separationWeight: 2.2
   cohesionWeight: 0.8
   alignmentWeight: 1.2
   flockInfluence: 1
-  correctionProbability: 40
+  correctionProbability: 50
   baseMoveSpeed: 10
   baseRotationSpeed: 300
   speedDeviation: 2
   rotationSpeedDeviation: 15
   rotationSmoothing: 5
-  updateInterval: 2
+  updateInterval: 1
 --- !u!114 &4087616115681235363
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 7 - 3
ActionTowerDefense/Assets/Scenes/Game.unity

@@ -20832,6 +20832,8 @@ MonoBehaviour:
   leveType: 0
   nextLevelButton: {fileID: 2041973834}
   isGaming: 0
+  ratioIncrease: 0.4
+  levelRatio: 1
 --- !u!4 &1714821086
 Transform:
   m_ObjectHideFlags: 0
@@ -20883,17 +20885,18 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cc3bac8dfa08dec4eb5eb9ed66ff6369, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  isDebug: 1
+  isDebug: 0
   isAddLevel_debug: 0
   levelIdA_debug: 8
   levelIdB_debug: 2
   curLevel: {fileID: 741372831}
-  curLevelID: 0
+  curLevelID: 4
   levels:
-  - "0:\u6C34\u9762\u5173\u53611"
+  - "0:9\u54081\u5173\u5361\u5C1D\u8BD5"
   - "1:\u6C34\u9762\u5173\u53612"
   - "2:\u4ED9\u5BAB\u5173\u53611"
   - "3:\u4ED9\u5BAB\u5173\u53612"
+  - "4:debug\u7528"
 --- !u!114 &1714821089
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -24093,6 +24096,7 @@ MonoBehaviour:
   totalHp: 100
   hp: 0
   canFly: 1
+  canControlFly: 0
   nowCanFly: 0
   canNotShotDown: 0
   canNotAddForce: 0

+ 1 - 1
ActionTowerDefense/Assets/Scripts/Characters/Character.cs

@@ -100,7 +100,7 @@ public class Character : MonoBehaviour
     public bool canFly = false;
     public bool canControlFly = false;
     [HideInInspector] public bool nowCanFly; //当前是否能飞行
-    [LabelText("不会被击落,用于让不可飞行怪可以被击落")] public bool canNotShotDown = true;
+    [LabelText("不会被击落")][Tooltip("本来不能飞行的怪没法被击落,取消勾选这个可以让那些地面怪也被击落(例如爬上树的水猴子)")] public bool canNotShotDown = true;
     [LabelText("不会被击飞")] public bool canNotAddForce;
     [LabelText("不会被虚弱")] public bool canNotChangeHurt;
     [DisplayOnly]

+ 3 - 1
ActionTowerDefense/Assets/Scripts/Characters/Polliwog.cs

@@ -39,6 +39,7 @@ public class Polliwog : Enemy
     protected override void OnEnable()
     {
         base.OnEnable();
+        PolliwogManager.GetInstance().AddPolliwog(this);
         isDie = false;
         currentVelocity = Vector2.zero;
         moveSpeed = baseMoveSpeed + Random.Range(-speedDeviation, speedDeviation);
@@ -48,7 +49,8 @@ public class Polliwog : Enemy
     }
     private void Start()
     {
-        attackController.attackTrigger.attackInfo.damage = damage;
+        if(damage == 0) attackController.attackTrigger.attackInfo.damage = attackController.attackInfo.damage;
+        else attackController.attackTrigger.attackInfo.damage = damage;
     }
 
     public void Init(int _damage)

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

@@ -26,7 +26,6 @@ public class PolliwogShot : SpecialSkills
             {
                 Polliwog pol = obj.GetComponent<Polliwog>();
                 pol.Init(6);
-                PolliwogManager.GetInstance().AddPolliwog(pol);
             });
         }
     }

Diferenças do arquivo suprimidas por serem muito extensas
+ 155 - 25
ActionTowerDefense/Assets/TextMesh Pro/Resources/Fonts & Materials/AaErMoXingShu-2 SDF.asset


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

@@ -1,49 +1,49 @@
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy0.cs,AB29D72F88DA21F37DF5814301FA54,1411,1754365860724
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy1.cs,F05C262B4431A7AC7FC6AA6DE5913FFD,1411,1754365860734
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy2.cs,F6808C2615297553259061CF6659CDA0,1411,1754365860731
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy3.cs,783D8132F3C1264DE0CDFF7DE647ED3A,1411,1754365860730
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy4.cs,62C7E271ECBF7FD76285ECBC134F2518,1411,1754365860721
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy5.cs,D3C353D6CB939D6EC5E83E76FD788BA4,1411,1754365860727
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy6.cs,BE5ABED2FAD9CBCDB46E6624D105DE9,1411,1754365860725
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy7.cs,F24276191D329CFD49BE3CFE63A6369,1411,1754365860723
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy8.cs,4E33E8C4126981D54EE97C5D68E6E5D,1411,1754365860727
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy0.cs,AB29D72F88DA21F37DF5814301FA54,1411,1754474687740
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy1.cs,F05C262B4431A7AC7FC6AA6DE5913FFD,1411,1754474687743
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy2.cs,F6808C2615297553259061CF6659CDA0,1411,1754474687735
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy3.cs,783D8132F3C1264DE0CDFF7DE647ED3A,1411,1754474687740
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy4.cs,62C7E271ECBF7FD76285ECBC134F2518,1411,1754474687737
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy5.cs,D3C353D6CB939D6EC5E83E76FD788BA4,1411,1754474687743
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy6.cs,BE5ABED2FAD9CBCDB46E6624D105DE9,1411,1754474687743
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy7.cs,F24276191D329CFD49BE3CFE63A6369,1411,1754474687739
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgCreateEnemy8.cs,4E33E8C4126981D54EE97C5D68E6E5D,1411,1754474687737
 D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgEnemy.cs,AA55E3EA298642B35239B74ED55BFBB,1840,1751443568371
 D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/CfgSoldierLevel.cs,A08CC235369146A3251A76BCCA2B9E,1381,1751443568368
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy0Config.cs,60407345294E9F703E3290455AAC46E8,5797,1754365860710
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy1Config.cs,872C45DDD94F4535639C3C0479F48,5796,1754365860712
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy2Config.cs,746C6210A6A64B61E5F6BFC62D388C25,5796,1754365860719
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy3Config.cs,62C861EA56196C8E48E981FD49F5873,5797,1754365860713
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy4Config.cs,D079D6FB6A18917E7E19BF7B692ED378,5798,1754365860710
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy5Config.cs,8ED240EDCF42ED6594C86117E3C47,5797,1754365860715
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy6Config.cs,25EC17F3A3796E4A52411973B98D7BA2,5795,1754365860710
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy7Config.cs,361FA82BE8AFCDEF0C6D7259A898FC,5796,1754365860710
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy8Config.cs,781D8666082D85C9399EF8B2D4CA311,5797,1754365860719
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy0Config.cs,60407345294E9F703E3290455AAC46E8,5797,1754474687722
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy1Config.cs,872C45DDD94F4535639C3C0479F48,5796,1754474687728
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy2Config.cs,746C6210A6A64B61E5F6BFC62D388C25,5796,1754474687731
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy3Config.cs,62C861EA56196C8E48E981FD49F5873,5797,1754474687722
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy4Config.cs,D079D6FB6A18917E7E19BF7B692ED378,5798,1754474687722
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy5Config.cs,8ED240EDCF42ED6594C86117E3C47,5797,1754474687731
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy6Config.cs,25EC17F3A3796E4A52411973B98D7BA2,5795,1754474687726
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy7Config.cs,361FA82BE8AFCDEF0C6D7259A898FC,5796,1754474687722
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleCreateEnemy8Config.cs,781D8666082D85C9399EF8B2D4CA311,5797,1754474687724
 D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleEnemyConfig.cs,B959AABD6E72533BB8F544E6A69E145,4518,1751443568363
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleSoldierLevel.cs,C2FD42AC3F2F7D669FA6B62941C4622B,4028,1753947006377
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/Tables.cs,B95449FF26EEBEAEBD8F07C83622,3789,1754365860734
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy0.json,A2ADAEE9129C47E5B8EC5E127F24610,9123,1754364282529
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy1.json,D670D6CB45F5C8A15EBDD7B3897EE2A9,9123,1754364282530
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy2.json,9253EC2DFB5EC2CADAB9E1FB84D65E28,9123,1754364282533
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy3.json,2B7BECE92DCA726FF3CB4CFFFFFC8472,9123,1754364282533
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy4.json,42BA3DE57DA1D092C53F834931C12B8,9129,1754364282534
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy5.json,D852A6A9E71D3CE5C4F0E91E4644438D,9123,1754364282534
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy6.json,D97E20FC7B34CDDE556FB01DB114C7F,9135,1754364282536
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy7.json,95C88AA2C64868E37692EB26A31FCC,9123,1754364282537
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy8.json,FBEE64FCD78578E67E257180FDF2C232,9115,1754364282538
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,40D77C4379E13C7F8D9226FF3851C4B2,3667,1754365860717
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgsoldierlevel.json,5A5D69E4CA68E7F321C703FB17428FF,21361,1753840696462
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/SingleSoldierLevel.cs,C2FD42AC3F2F7D669FA6B62941C4622B,4028,1754474687734
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Assets/Gen/Tables.cs,B95449FF26EEBEAEBD8F07C83622,3789,1754474687745
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy0.json,ACC9DD73D642A19116D5534D23E72B8,14900,1754474009515
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy1.json,BC1AB815C4F94DBA97F719826FDB5318,14240,1754474009516
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy2.json,5F3731922725BF28A6F1AACF756D68B,21952,1754474009516
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy3.json,8BB0FF7219F4EB5A264C44D20C4737D,14197,1754474009518
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy4.json,A0958E59F2B2278453D2E2EAD6D3C4,14210,1754474009519
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy5.json,6FB3C3B2FAD6C69988FFF024AE419DB,14205,1754474009519
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy6.json,8474CA3616C57767FE607120368D6757,14205,1754474009520
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy7.json,A6798B03CB3B8B0818715B0751B0EB,14225,1754474009520
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy8.json,271C394794532A4427491ABCEC7BED,14221,1754474009521
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,188A5D1C6D4345D6DD7D37DA3723AB52,3662,1754474009522
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/GenerateDatas/json/cfgsoldierlevel.json,F36CD15F3099CDBE83B5F7147B1FB230,21394,1754474009522
 D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/__beans__.xlsx,98987DA7288FEE34BCD08EA883D425E,9603,1751380895220
 D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/__enums__.xlsx,D95915E233EB1E4EB87BE0557A2BFDD,9879,1751380895221
 D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/__tables__.xlsx,13B055F2AA47B5120E4AB6D3232D84,10562,1754364282551
 D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/动态出怪表.xlsx,15899EE15CF2654934EA22467A55E69,14212,1753840696464
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,B41640A09CDA5A2F136D551DDF77B02F,13101,1754365838756
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/士兵等级属性表.xlsx,DCEA10D928F453DDF302A57F02772FB,17030,1753840696465
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表0.xlsx,6DAC09FD98993FE6DE87BCA983064,17585,1754364282540
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表1.xlsx,F2863874F5B679F9F8A24D1683B3F472,17616,1754364282541
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表2.xlsx,275C116A4B8ECE209FCCE6FCB1ABDF7D,17583,1754364282542
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表3.xlsx,F0A767BAB5365517C784DF3F18DD696B,17580,1754364282543
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表4.xlsx,CE4BA86B6DE07DE24D094867A644D2,17583,1754364282544
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表5.xlsx,6996CABB373D4D93C83B3E5625AE26F,17583,1754364282546
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表6.xlsx,AEE2571C29EF76D7A3E7CB6426347FA,17583,1754364282548
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表7.xlsx,9BCF2A2FA51C2029A89FF8608AFE16B4,17579,1754364282548
-D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表8.xlsx,C0C8916D10DAD656A1B0489AD0A7F0F9,17573,1754364282549
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,83745D85FC695321BD09B83CE8686D5,11761,1754474009533
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/士兵等级属性表.xlsx,8516BB466915A2716EC7516264EE8275,16963,1754474009532
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表0.xlsx,2CEA89FAED9C154C7262C725958548,22334,1754474009524
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表1.xlsx,77BD3D8B2F2E2C12F65925DCE4F040,20780,1754474009525
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表2.xlsx,545C462DDF5D582ED9D743AF39D80,22179,1754474009526
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表3.xlsx,EFDF6C41652CDE2AF89E475CA8937C0,21036,1754474009527
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表4.xlsx,FF78BA78C94ED8D10F71DE9423F71E9,20994,1754474009528
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表5.xlsx,CA36DB47A43F5B076FC5FAAD0A0CF21,21007,1754474009528
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表6.xlsx,AD4283DF41AA2436A575547A382D38,21016,1754474009529
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表7.xlsx,F58AB617650C496F181F49CAB1C5F1E,21064,1754474009531
+D:/桌面/工程文件/Unity/WORK/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表8.xlsx,4923B16DD076E40F9D40EC9A13B57,21062,1754474009531

Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff