Просмотр исходного кода

修复召唤蝌蚪后boss立刻出现的bug

HY-LSZNWIN10\Administrator 1 день назад
Родитель
Сommit
6e296efbe3

Разница между файлами не показана из-за своего большого размера
+ 4 - 157
ActionTowerDefense/Assets/GameLevelEditor/maps.asset


+ 1 - 1
ActionTowerDefense/Assets/Scenes/Game.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.08884769, g: 0.23271483, b: 0.22609791, a: 1}
+  m_IndirectSpecularColor: {r: 0.088847615, g: 0.23271477, b: 0.22609779, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:

+ 2 - 1
ActionTowerDefense/Assets/Scripts/Boss/WaterGhost/WaterSprite.cs

@@ -185,7 +185,7 @@ public class WaterSprite : Boss
             attack.blackUmbrella.BeCleared();
             isHoldingUmbre = true;
         }
-        StopCoroutine(shootCoroutine);
+        if(shootCoroutine != null) StopCoroutine(shootCoroutine);
     }
 
     public override void ChangeBossState(BossState bs)
@@ -391,6 +391,7 @@ public class WaterSprite : Boss
                 pws.AllPoliDie();
                 break;
             case BossStage.polliwog:
+                pastPoliTime = 0;
                 bodyTrans.gameObject.SetActive(false);
                 //ÔÚÔ­µØÕÙ»½Ò»¶Ñòòò½
                 pws.Shoot(polliNum, bodyTrans.position);

+ 41 - 1
ActionTowerDefense/GenerateDatas/json/cfgcreateenemy0.json

@@ -1076,6 +1076,46 @@
     "ArmorRatio": 1,
     "ArmorPiercingRatio": 1
   },
+  {
+    "WaveID": 0,
+    "WaveName": "我塔",
+    "WaveTime": 0,
+    "BuildingID": "",
+    "BuildingHP": 0,
+    "EnemyName": "防御塔",
+    "Position": [
+      120,
+      1
+    ],
+    "StartTime": 0,
+    "EndTime": 0,
+    "Count": 1,
+    "AttackRatio": 1,
+    "SpeedRatio": 1,
+    "HPRatio": 1,
+    "ArmorRatio": 1,
+    "ArmorPiercingRatio": 1
+  },
+  {
+    "WaveID": 0,
+    "WaveName": "我塔",
+    "WaveTime": 0,
+    "BuildingID": "",
+    "BuildingHP": 0,
+    "EnemyName": "防御塔",
+    "Position": [
+      120,
+      1
+    ],
+    "StartTime": 0,
+    "EndTime": 0,
+    "Count": 1,
+    "AttackRatio": 1,
+    "SpeedRatio": 1,
+    "HPRatio": 1,
+    "ArmorRatio": 1,
+    "ArmorPiercingRatio": 1
+  },
   {
     "WaveID": 1,
     "WaveName": "1",
@@ -1084,7 +1124,7 @@
     "BuildingHP": 0,
     "EnemyName": "白家娘娘",
     "Position": [
-      100,
+      93,
       1
     ],
     "StartTime": 5,

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

@@ -19,26 +19,26 @@ D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleEnemyConfig.cs,2F7D45D76818E
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleSoldierLevel.cs,C2FD42AC3F2F7D669FA6B62941C4622B,4028,1755056555307
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/SingleTreasureConfig.cs,1FB93C4C3ED22087511AACB14BDCA05A,4862,1758081545602
 D:/Projects/Act/ActionTowerDefense/Assets/Gen/Tables.cs,E8BFA53D69146130DA7792A7349723,3477,1761098056782
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy0.json,EECC515E8391CE7860C980CBEA105B44,21952,1761728450486
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy1.json,D02528AD81AED13966E9E5794B980E6,22985,1761204729516
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy2.json,B664D913947BB924F19958AFF4DE7A7,30746,1761012401099
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy3.json,9C70A7A2C36CDC6EB5AE89659CC8029,23863,1761012401100
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy4.json,D7C9ADEEECE16CC7288FEA67AFF3A6,21199,1761102820483
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy0.json,5EEE52C85D7B2B8EDAAA1B45F3FB332E,22695,1762243975767
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy1.json,5FD2FD6A8C8B87BFBDF7AE6CAFF8148,22985,1761808464871
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy2.json,4C532E9414C38344B6289902136D6A,30758,1761808464871
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy3.json,D2E3FEBC217BCA4CAD08ED223AA53B,23893,1761808464871
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy4.json,F5537C9429317D1BEFE199D2ABBD6F46,21229,1761808464872
 D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy5.json,A0A6E68E99EE2C1988B2B3A569F1E51D,21146,1761204729518
 D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgcreateenemy6.json,D0A4FD7DD78A79F6DFF986CA40755D96,21191,1761204729520
-D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,6CDCED45D0EBD906AA8972D70A2C8AC,7312,1761708185429
+D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgenemy.json,B28678ADF87D34DCDA6161552D53476,7590,1762221655823
 D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgsoldierlevel.json,3E6E2D89634AB53738E43FC60CB443C,21157,1759917336547
 D:/Projects/Act/ActionTowerDefense/GenerateDatas/json/cfgtreasure.json,EC20E890B27C968A09B9C88954C9459,12470,1761101313280
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/__beans__.xlsx,98987DA7288FEE34BCD08EA883D425E,9603,1754989782470
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/__enums__.xlsx,D95915E233EB1E4EB87BE0557A2BFDD,9879,1754989782470
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/__tables__.xlsx,8316D1AD714AEE794DF51B62D388F4F,10574,1761031681958
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/宝物表.xlsx,1EA4D9F94B4C56EDAB46F63615676924,13781,1761101308727
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,AA82AD427EFEC369C98EE5D7B9F8544,12528,1761708185429
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/怪物表.xlsx,1CABEF16CCA54529465E6D0E1CACB,12605,1762221655824
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/士兵等级属性表.xlsx,DDD81A154B1E21118EAE9DE1C8DC6F,15235,1759917329774
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表0.xlsx,71BDC4AFB9C165C3D211E9A2282A25CC,23095,1761728447561
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表1.xlsx,DA523CEBBB6DC8A367A4C994E7ADAD7D,20695,1761204729521
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表2.xlsx,9A922212FC03D60C7157F5D3BE08097,22214,1761012401103
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表3.xlsx,CE83504F858BD5F3DA5E159FEA6A37C4,20501,1761012401103
-D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表4.xlsx,EEE6C82F8469CD337FA2437A3BA23CF,20164,1761102820484
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表0.xlsx,2A908C57477FAD8E9A56BE699D21DD30,21106,1762243974778
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表1.xlsx,C59E2EF0F3B86FF879BCD1B85D605940,20688,1761808464873
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表2.xlsx,DC4EA2AC90A2426D4674165ABA13715,22209,1761808464874
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表3.xlsx,7312CC14C381D33028213F30BEAB7B,20509,1761808464874
+D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表4.xlsx,A3794C82AEB5227A79AB629AB9E8FBD,20188,1761808464875
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表5.xlsx,5CA49CBAE296CE84F337333F5108286,20212,1761204729522
 D:/Projects/Act/ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表6.xlsx,D29DC7D0F45B4EEE989F197B3E471,20067,1761204729527

BIN
ActionTowerDefense/Luban/Config/Datas/EnemyCreater/出怪表0.xlsx


Некоторые файлы не были показаны из-за большого количества измененных файлов